diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-24 17:24:12 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-24 17:24:12 -0400 |
| commit | 781ec13084576793df341c6e162155c3d1fcebaf (patch) | |
| tree | 7d0f464bbf8f69bad0c5eb411840565978bde723 /tools | |
| parent | 52363ebefd165916fa6ba1e4ffb6f0cc5ac436c3 (diff) | |
more packaging changes/debugging
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/package | 2 | ||||
| -rwxr-xr-x | tools/linux_packaging/stage2.run | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tools/linux_packaging/package b/tools/linux_packaging/package index cffe32fded..b1ba58a250 100755 --- a/tools/linux_packaging/package +++ b/tools/linux_packaging/package @@ -52,7 +52,7 @@ done # Figure out the Build Type -if grep -q "DEBUG = True" ../../build/c4che/default.cache.py; then +if grep -q "DEBUG = True" ../../build/c4che/_cache.py; then DEBUG="T" else DEBUG="F" diff --git a/tools/linux_packaging/stage2.run b/tools/linux_packaging/stage2.run index 3541cf02c2..237f0ac93c 100755 --- a/tools/linux_packaging/stage2.run +++ b/tools/linux_packaging/stage2.run @@ -371,9 +371,10 @@ fi ################################ # Setup derived variables ################################ -PGM_VERSION=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $2 }') -PGM_BUILD=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $3 }') -PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $3 }') +PGM_VERSION=$(echo ${BUNDLE_DIR} | cut -d- -f2) +PGM_BUILD=$(echo ${BUNDLE_DIR} | cut -d- -f3) +PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | cut -d- -f4) + if [ -z ${PGM_BUILDTYPE} ]; then @@ -392,6 +393,8 @@ PGM_EXEC_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/bin/${PGM_EXEC_FILE}" ICON_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/share/icons" MENU_FILE_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/share" +echo "VERSION [$PGM_VERSION] BUILD [$BUILD] FULLNAME[$PGM_FULL_NAME] EXECPATH [$PGM_EXEC_PATH]" + ################################ # Install bundle and Menu/Link ################################ |