diff --git a/.github/workflows/retrieve_version.sh b/.github/workflows/retrieve_version.sh index bec049c..68a6138 100644 --- a/.github/workflows/retrieve_version.sh +++ b/.github/workflows/retrieve_version.sh @@ -3,7 +3,7 @@ set -e # get version -VERSION=$(jq -r '.version' ./utility/version_info.json) +VERSION=$(jq -r '.ym.version' ./utility/version_info.json) release_name="Beta $VERSION" tag_name="v$VERSION" diff --git a/build_deb.sh b/build_deb.sh index 9219470..e0e0f81 100755 --- a/build_deb.sh +++ b/build_deb.sh @@ -95,10 +95,10 @@ TEMPDIR="$(mktemp -d)" trap clear EXIT #loading version info with jq -version=$(jq -r '.version' ./utility/version_info.json) -exe_name=$(jq -r '.exe_name' ./utility/version_info.json) -exe_link=$(jq -r '.exe_link' ./utility/version_info.json) -exe_sha256=$(jq -r '.exe_sha256' ./utility/version_info.json) +version=$(jq -r '.ym.version' ./utility/version_info.json) +exe_name=$(jq -r '.ym.exe_name' ./utility/version_info.json) +exe_link=$(jq -r '.ym.exe_link' ./utility/version_info.json) +exe_sha256=$(jq -r '.ym.exe_sha256' ./utility/version_info.json) #downloading exe echo "Downloading ${exe_name}" diff --git a/nix/default.nix b/nix/default.nix index 9f10944..75462ea 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -17,7 +17,7 @@ in stdenvNoCC.mkDerivation { name = "yandex-music"; - inherit (version_info) version; + inherit (version_info.ym) version; nativeBuildInputs = [ p7zip @@ -36,8 +36,8 @@ stdenvNoCC.mkDerivation then ymExe else fetchurl { - url = version_info.exe_link; - sha256 = version_info.exe_sha256; + url = version_info.ym.exe_link; + sha256 = version_info.ym.exe_sha256; }; unpackPhase = '' diff --git a/utility/generate_packages.sh b/utility/generate_packages.sh index 0f68a46..9aa3dfc 100644 --- a/utility/generate_packages.sh +++ b/utility/generate_packages.sh @@ -51,10 +51,12 @@ update_version() { cat > ./utility/version_info.json <