From 6c0b645ba67d720a381b90aa3edb7d50cd78f18e Mon Sep 17 00:00:00 2001 From: TC Johnson Date: Wed, 17 Jul 2024 15:18:59 -0500 Subject: [PATCH] Commiting and pushing so I can test on a RPM build machine --- package/debian/earthly_make_veilid_cli_deb.sh | 6 +++-- .../debian/earthly_make_veilid_server_deb.sh | 24 +++++++++---------- package/debian/veilid-cli/DEBIAN/control | 2 +- package/debian/veilid-server/DEBIAN/control | 4 +++- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/package/debian/earthly_make_veilid_cli_deb.sh b/package/debian/earthly_make_veilid_cli_deb.sh index 86c04b06..c0feb9a1 100755 --- a/package/debian/earthly_make_veilid_cli_deb.sh +++ b/package/debian/earthly_make_veilid_cli_deb.sh @@ -10,7 +10,8 @@ rm -rf /dpkg mkdir -p /dpkg/out # veilid-cli dpkg control -cp -rf /veilid/package/debian/veilid-cli /dpkg# Appropriatly name the package for STABLE or NIGHTLY release +cp -rf /veilid/package/debian/veilid-cli /dpkg +# Appropriatly set vars for STABLE or NIGHTLY release if [ "$3" = "true" ] then /veilid/package/replace_variable.sh /dpkg/veilid-cli/DEBIAN/control CARGO_VERSION $BUILD_DATE @@ -35,4 +36,5 @@ then mv /dpkg/veilid-cli.deb /dpkg/out/veilid-cli-$CARGO_VERSION\_$ARCH.deb else echo $3 "is not a valid state to determine if the build is STABLE or NIGHTLY" -fi \ No newline at end of file +fi +echo "make veilid-cli deb process complete" \ No newline at end of file diff --git a/package/debian/earthly_make_veilid_server_deb.sh b/package/debian/earthly_make_veilid_server_deb.sh index bdf7916b..55d4e2a4 100755 --- a/package/debian/earthly_make_veilid_server_deb.sh +++ b/package/debian/earthly_make_veilid_server_deb.sh @@ -11,17 +11,16 @@ mkdir -p /dpkg/out # veilid-server dpkg control cp -rf /veilid/package/debian/veilid-server /dpkg -# Appropriatly name the package for STABLE or NIGHTLY release -# if [ "$3" = "true" ] -# then -# /veilid/package/replace_variable.sh /dpkg/veilid-server/DEBIAN/control CARGO_VERSION $BUILD_DATE -# elif [ "$3" = "false" ] -# then -# /veilid/package/replace_variable.sh /dpkg/veilid-server/DEBIAN/control CARGO_VERSION $CARGO_VERSION -# else -# echo $3 "is not a valid state to determine if the build is STABLE or NIGHTLY" -# fi -/veilid/package/replace_variable.sh /dpkg/veilid-server/DEBIAN/control CARGO_VERSION $CARGO_VERSION +# Appropriatly set vars for for STABLE or NIGHTLY release +if [ "$3" = "true" ] +then + /veilid/package/replace_variable.sh /dpkg/veilid-server/DEBIAN/control CARGO_VERSION $BUILD_DATE +elif [ "$3" = "false" ] +then + /veilid/package/replace_variable.sh /dpkg/veilid-server/DEBIAN/control CARGO_VERSION $CARGO_VERSION +else + echo $3 "is not a valid state to determine if the build is STABLE or NIGHTLY" +fi /veilid/package/replace_variable.sh /dpkg/veilid-server/DEBIAN/control ARCH $ARCH # veilid-server configuration mkdir -p /dpkg/veilid-server/etc/veilid-server @@ -43,4 +42,5 @@ then mv /dpkg/veilid-server.deb /dpkg/out/veilid-server-$CARGO_VERSION\_$ARCH.deb else echo $3 "is not a valid state to determine if the build is STABLE or NIGHTLY" -fi \ No newline at end of file +fi +echo "make veilid-server deb process complete" \ No newline at end of file diff --git a/package/debian/veilid-cli/DEBIAN/control b/package/debian/veilid-cli/DEBIAN/control index 3efe932f..150d20a1 100644 --- a/package/debian/veilid-cli/DEBIAN/control +++ b/package/debian/veilid-cli/DEBIAN/control @@ -6,4 +6,4 @@ Architecture: $ARCH Depends: libc6 (>= 2.23) Maintainer: jsmith@veilid.org Description: Veilid Server Command Line Interface - The Veilid peer-to-peer network server command line interface + This package installs a a CLI interface for locally installed Veilid peer-to-peer network headless nodes. diff --git a/package/debian/veilid-server/DEBIAN/control b/package/debian/veilid-server/DEBIAN/control index 53d2d3de..8ad25070 100644 --- a/package/debian/veilid-server/DEBIAN/control +++ b/package/debian/veilid-server/DEBIAN/control @@ -6,4 +6,6 @@ Architecture: $ARCH Depends: libc6 (>= 2.23) Maintainer: jsmith@veilid.org Description: Veilid Server - The Veilid peer-to-peer network server + This package installs a Veilid peer-to-peer network headless node which can be deployed for + supporting the overall Veilid network or for local development/experimental purposes. See + https://veilid.com for more information.