Another step towards gcc-ABI detection when installing as root

makeself extracts the file with owner-only access.
When the installer itself runs as root, NORM_USER won't be able to
call the abi-test tool.

diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in
index e1fe3ffc1de2141e72a2b4588153f2d62d457ce1..ae4e217a49a596f30eab2310798b8e4252ae3f26 100755 (executable)
--- a/tools/linux_packaging/stage2.run.in
+++ b/tools/linux_packaging/stage2.run.in
@@ -235,7 +235,7 @@ esac
 ###################
 
 if test -n "$MULTABI_BUNDLE"; then
-       if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --fail --gcc5 > /dev/null"; then
+       if ! "${PKG_PATH}/.gcc-glibmm-abi-check" --fail --gcc5; then
                ABI=-gcc4
        else
                ABI=-gcc5
@@ -306,7 +306,7 @@ fi
 if test -z "$ABI"; then
        if %REPLACE_GCC5%; then
                # Ardour was compiled with gcc5, warn on gcc4 systems
-               if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --gcc5 > /dev/null"; then
+               if ! "${PKG_PATH}/.gcc-glibmm-abi-check" --gcc5; then
                        echo ""
                        echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
                        echo ""
@@ -321,7 +321,7 @@ if test -z "$ABI"; then
                fi
        else
                # Ardour was compiled with gcc4, warn on gcc5 systems
-               if ! ${NORM_USER} "${PKG_PATH}/.gcc-glibmm-abi-check --gcc4 > /dev/null"; then
+               if ! "${PKG_PATH}/.gcc-glibmm-abi-check" --gcc4 ; then
                        echo ""
                        echo "WARNING: GCC4/5 libstdc++ ABI Mismatch"
                        echo ""