diff options
Diffstat (limited to 'tools/linux_packaging/build')
| -rwxr-xr-x | tools/linux_packaging/build | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index e7f7d8b6dd..e8cc4d53b2 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -97,8 +97,12 @@ fi . ../define_versions.sh -echo "Version is $version / $commit" -info_string="$version ($commit) built on `hostname` by `whoami` on `date`" +echo "Version is $release_version" +if [ "x$commit" != "x" ] ; then + info_string="$release_version ($commit) built on `hostname` by `whoami` on `date`" +else + info_string="$release_version built on `hostname` by `whoami` on `date`" +fi echo "Info string is $info_string" # Figure out our CPU type @@ -134,11 +138,11 @@ fi # setup directory structure if [ -z "${BUILDTYPE}" ]; then - APPDIR=${APPNAME}_${ARCH}-${version} - APP_VER_NAME=${APPNAME}-${version} + APPDIR=${APPNAME}_${ARCH}-${release_version} + APP_VER_NAME=${APPNAME}-${release_version} else - APPDIR=${APPNAME}_${ARCH}-${version}-${BUILDTYPE} - APP_VER_NAME=${APPNAME}-${version}-${BUILDTYPE} + APPDIR=${APPNAME}_${ARCH}-${release_version}-${BUILDTYPE} + APP_VER_NAME=${APPNAME}-${release_version}-${BUILDTYPE} fi APPBIN=$APPDIR/bin @@ -569,7 +573,7 @@ fi # # Add the uninstaller # -sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_VERSION%/${version}/" -e "s/%REPLACE_TYPE%/${BUILDTYPE}/" < uninstall.sh.in > $APPBIN/${APP_VER_NAME}.uninstall.sh +sed -e "s/%REPLACE_PGM%/${APPNAME}/" -e "s/%REPLACE_VENDOR%/${VENDOR}/" -e "s/%REPLACE_VERSION%/${release_version}/" -e "s/%REPLACE_TYPE%/${BUILDTYPE}/" < uninstall.sh.in > $APPBIN/${APP_VER_NAME}.uninstall.sh chmod a+x $APPBIN/${APP_VER_NAME}.uninstall.sh #Sanity Check file |