diff options
| author | Todd Naugle <toddn@glw.com> | 2012-12-21 21:40:06 +0000 |
|---|---|---|
| committer | Todd Naugle <toddn@glw.com> | 2012-12-21 21:40:06 +0000 |
| commit | d01a9599a4edf27d0de5da0a462e64db3401d511 (patch) | |
| tree | 2a7c68586c974b710997730fd9be559487eefee1 /tools | |
| parent | 4471f536435285d5d2e9f8dacfab51eff70bc061 (diff) | |
Check the return status of tar since it can fail. Print out the file system that the bundle is currently stored on. It may be useful for debugging failed installs. Simplify the frequency scaling warning message
git-svn-id: svn://localhost/ardour2/branches/3.0@13705 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/stage2.run | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/tools/linux_packaging/stage2.run b/tools/linux_packaging/stage2.run index e284e8a97a..f74e988650 100755 --- a/tools/linux_packaging/stage2.run +++ b/tools/linux_packaging/stage2.run @@ -262,6 +262,9 @@ else fi fi +FILESYSTEM_TYPE=$(df -P -T "${PKG_PATH}" | grep / | awk '{print $2}') +echo "Bundle is on ${FILESYSTEM_TYPE} filesystem" + ##################### # Unpack the bundle ##################### @@ -277,7 +280,16 @@ if [ ! -e ${PGM_NAME}_${ARCH}-*.tar.bz2 ]; then exit 1 fi -tar -xjf ${PGM_NAME}_${ARCH}-*.tar.bz2 +if ! tar -xjf ${PGM_NAME}_${ARCH}-*.tar.bz2; then + echo "" + echo "!!! ERROR !!! Can't unpack ${ARCH} bundle file." + echo "" + read -p "Press ENTER to exit installer:" BLAH + exit 1 +else + echo "Bundle unpacked" +fi + BUNDLE_DIR=$(basename `find -maxdepth 1 -type d -name "${PGM_NAME}_${ARCH}-*"`) @@ -640,10 +652,8 @@ then then echo "" echo "!!! WARNING !!! - Your system seems to use frequency scaling." - echo "This can have a serious impact on audio latency. You have two choices:" - echo "(1) turn it off, e.g. by chosing the 'performance' governor." - echo "(2) Use the HPET clocksource by passing \"-c h\" to JACK" - echo "(this second option only works on relatively recent computers)" + echo "This can have a serious impact on audio latency." + echo "For best results turn it off, e.g. by chosing the 'performance' governor." echo "" read -p "Press ENTER to continue:" BLAH fi |