From 7dadd2fbea40ef79f4dba47745131f5e80a8bcb5 Mon Sep 17 00:00:00 2001 From: TC Johnson Date: Sun, 14 Jul 2024 19:15:09 -0500 Subject: [PATCH] Changed IS_NIGHTLY var checks to string from bool --- package/debian/earthly_make_veilid_cli_deb.sh | 4 ++-- package/debian/earthly_make_veilid_server_deb.sh | 4 ++-- package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh | 4 ++-- package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/debian/earthly_make_veilid_cli_deb.sh b/package/debian/earthly_make_veilid_cli_deb.sh index 5fdec937..f971f5fa 100755 --- a/package/debian/earthly_make_veilid_cli_deb.sh +++ b/package/debian/earthly_make_veilid_cli_deb.sh @@ -19,10 +19,10 @@ cp -f /veilid/target/$CARGO_ARCH/release/veilid-cli /dpkg/veilid-cli/usr/bin # pack it up dpkg-deb -b /dpkg/veilid-cli/ # Appropriatly name the package for STABLE or NIGHTLY release -if [ "$3" = true ] +if [ "$3" = "true" ] then mv /dpkg/veilid-cli.deb /dpkg/out/veilid-cli-$BUILD_DATE\_$ARCH.deb -elif [ "$3" = false ] +elif [ "$3" = "false" ] then mv /dpkg/veilid-cli.deb /dpkg/out/veilid-cli-$CARGO_VERSION\_$ARCH.deb else diff --git a/package/debian/earthly_make_veilid_server_deb.sh b/package/debian/earthly_make_veilid_server_deb.sh index 40a4540b..dfca29dd 100755 --- a/package/debian/earthly_make_veilid_server_deb.sh +++ b/package/debian/earthly_make_veilid_server_deb.sh @@ -25,10 +25,10 @@ cp -f /veilid/target/$CARGO_ARCH/release/veilid-server /dpkg/veilid-server/usr/b # pack it up dpkg-deb -b /dpkg/veilid-server/ # Appropriatly name the package for STABLE or NIGHTLY release -if [ "$3" = true ] +if [ "$3" = "true" ] then mv /dpkg/veilid-server.deb /dpkg/out/veilid-server-$BUILD_DATE\_$ARCH.deb -elif [ "$3" = false ] +elif [ "$3" = "false" ] then mv /dpkg/veilid-server.deb /dpkg/out/veilid-server-$CARGO_VERSION\_$ARCH.deb else diff --git a/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh b/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh index f5b07224..b9884df5 100755 --- a/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh +++ b/package/rpm/veilid-cli/earthly_make_veilid_cli_rpm.sh @@ -7,10 +7,10 @@ CARGO_VERSION="$(/veilid/package/cargo_version.sh /veilid/veilid-cli/Cargo.toml) # veilid-cli spec file cp -rf /veilid/package/rpm/veilid-cli/veilid-cli.spec /root/rpmbuild/SPECS/ -if [ "$3" = true ] +if [ "$3" = "true" ] then /veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-cli.spec RELEASE_VERSION $BUILD_DATE -elif [ "$3" = false ] +elif [ "$3" = "false" ] /veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-cli.spec RELEASE_VERSION $CARGO_VERSION else echo $3 "is not a valid state to determine if the build is STABLE or NIGHTLY" diff --git a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh index 590c4f45..267ff704 100755 --- a/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh +++ b/package/rpm/veilid-server/earthly_make_veilid_server_rpm.sh @@ -8,10 +8,10 @@ CARGO_VERSION="$(/veilid/package/cargo_version.sh /veilid/veilid-server/Cargo.to # veilid-server spec file cp -rf /veilid/package/rpm/veilid-server/veilid-server.spec /root/rpmbuild/SPECS/ # Select CARGO_VERSION for STABLE releases or BUILD_DATE for NIGHTLY releases -if [ "$3" = true ] +if [ "$3" = "true" ] then /veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec RELEASE_VERSION $BUILD_DATE -elif [ "$3" = false ] +elif [ "$3" = "false" ] /veilid/package/replace_variable.sh /root/rpmbuild/SPECS/veilid-server.spec RELEASE_VERSION $CARGO_VERSION else echo $3 "is not a valid state to determine if the build is STABLE or NIGHTLY"