diff --git a/release/arch/arm/build-arm.sh b/release/arch/arm/build-arm.sh index 68d0bcf4526d2219e0e3a88db36e66e3fd4c48be..fc0891fd38fdbf083984dafac5a972f7219606ae 100755 --- a/release/arch/arm/build-arm.sh +++ b/release/arch/arm/build-arm.sh @@ -86,7 +86,7 @@ mkdir -p duniter_release cp -R ${SRC}/* duniter_release/ # Creating DEB packaging -mv duniter_release/release/arch/debian/package duniter-${ARCH} +mv duniter_release/release/extra/debian/package duniter-${ARCH} mkdir -p duniter-${ARCH}/opt/duniter/ chmod 755 duniter-${ARCH}/DEBIAN/post* chmod 755 duniter-${ARCH}/DEBIAN/pre* diff --git a/release/arch/linux/build-lin.sh b/release/arch/linux/build-lin.sh index e01deaa4fc780abe7ec008ba41c1d7d15badc75e..6abf5c16fa4a80be1b7cf4d0f24143c0c8fbb5d8 100644 --- a/release/arch/linux/build-lin.sh +++ b/release/arch/linux/build-lin.sh @@ -173,9 +173,9 @@ tar czf "${BIN}/duniter-desktop-${DUNITER_TAG}-linux-x64.tar.gz" * || exit 1 build_deb_pack() { rm -rf "${RELEASES}/duniter-x64" mkdir "${RELEASES}/duniter-x64" || exit 1 - cp -r "${ROOT}/release/arch/linux/debian/package/"* "${RELEASES}/duniter-x64" || exit 1 + cp -r "${ROOT}/release/extra/debian/package/"* "${RELEASES}/duniter-x64" || exit 1 if [[ "${1}" == "desktop" ]]; then - cp -r "${ROOT}/release/contrib/desktop/"* "${RELEASES}/duniter-x64" || exit 1 + cp -r "${ROOT}/release/extra/desktop/"* "${RELEASES}/duniter-x64" || exit 1 fi mkdir -p "${RELEASES}/duniter-x64/opt/duniter/" || exit 1 chmod 755 "${RELEASES}/duniter-x64/DEBIAN/"post* || exit 1 diff --git a/release/arch/linux/debian/package/DEBIAN/control b/release/extra/debian/package/DEBIAN/control similarity index 100% rename from release/arch/linux/debian/package/DEBIAN/control rename to release/extra/debian/package/DEBIAN/control diff --git a/release/arch/linux/debian/package/DEBIAN/postinst b/release/extra/debian/package/DEBIAN/postinst similarity index 100% rename from release/arch/linux/debian/package/DEBIAN/postinst rename to release/extra/debian/package/DEBIAN/postinst diff --git a/release/arch/linux/debian/package/DEBIAN/prerm b/release/extra/debian/package/DEBIAN/prerm similarity index 100% rename from release/arch/linux/debian/package/DEBIAN/prerm rename to release/extra/debian/package/DEBIAN/prerm diff --git a/release/contrib/desktop/usr/share/applications/duniter.desktop b/release/extra/desktop/usr/share/applications/duniter.desktop similarity index 100% rename from release/contrib/desktop/usr/share/applications/duniter.desktop rename to release/extra/desktop/usr/share/applications/duniter.desktop diff --git a/release/new_prerelease.sh b/release/new_prerelease.sh index bd5d78caa6a0c3d2b6612f3200e4011a9bb6e2e1..1a3a0a5206507451297dcf16e40c3ebc1cd6bf8d 100755 --- a/release/new_prerelease.sh +++ b/release/new_prerelease.sh @@ -42,13 +42,13 @@ for asset in $EXPECTED_ASSETS; do echo "Missing asset: $asset" - # Debian + # Linux if [[ $asset == *"linux-x64.deb" ]] || [[ $asset == *"linux-x64.tar.gz" ]]; then if [[ $ARCH == "x86_64" ]]; then - echo "Starting Debian build..." - ./release/scripts/build.sh make deb $TAG - DEB_PATH="$PWD/release/arch/debian/$asset" - node ./release/scripts/upload-release.js $TOKEN $TAG $DEB_PATH + echo "Starting Linux build..." + ./release/scripts/build.sh make lin $TAG + LIN_PATH="$PWD/release/arch/linux/$asset" + node ./release/scripts/upload-release.js $TOKEN $TAG $LIN_PATH else echo "This computer cannot build this asset, required architecture is 'x86_64'. Skipping." fi diff --git a/release/new_version.sh b/release/new_version.sh index fbbda1bdcf6dc7121e9980b3b17b8c53de176f16..6195860cb8be24a6e9715d1da33356498d8b4c06 100755 --- a/release/new_version.sh +++ b/release/new_version.sh @@ -8,7 +8,7 @@ if [[ $1 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ ]]; then echo "Changing to version: $1" # Change the version in package.json and test file sed -i "s/version\": .*/version\": \"$1\",/g" package.json - sed -i "s/Version: .*/Version: $1/g" release/arch/debian/package/DEBIAN/control + sed -i "s/Version: .*/Version: $1/g" release/extra/debian/package/DEBIAN/control sed -i "s/version').equal('.*/version').equal('$1');/g" test/integration/branches.js sed -i "s/ release: .*/ release: v$1/g" appveyor.yml @@ -21,7 +21,7 @@ if [[ $1 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ ]]; then # Commit git reset HEAD - git add package.json test/integration/branches.js gui/index.html release/arch/debian/package/DEBIAN/control release/arch/windows/duniter.iss + git add package.json test/integration/branches.js gui/index.html release/extra/debian/package/DEBIAN/control release/arch/windows/duniter.iss git commit -m "v$1" git tag "v$1" else