Exit code is not properly returned when using RUN_AS_USER (from http://jira.codehaus...

diff --git a/sonar-application/src/main/assembly/bin/linux-ppc-64/sonar.sh b/sonar-application/src/main/assembly/bin/linux-ppc-64/sonar.sh
index c080399c62c706e60a027bb665b684e86602c1da..aa02bd8703286bd03024c60e4d506c8907acce68 100755 (executable)
--- a/sonar-application/src/main/assembly/bin/linux-ppc-64/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/linux-ppc-64/sonar.sh
@@ -334,6 +334,7 @@ checkUser() {
         # Still want to change users, recurse.  This means that the user will only be
         #  prompted for a password once. Variables shifted by 1
         su -m $RUN_AS_USER -c "\"$REALPATH\" $2"
+        RETVAL=$?
 
         # Now that we are the original user again, we may need to clean up the lock file.
         if [ "X$LOCKPROP" != "X" ]
@@ -349,7 +350,7 @@ checkUser() {
             fi
         fi
 
-        exit 0
+        exit $RETVAL
     fi
 }
 

diff --git a/sonar-application/src/main/assembly/bin/linux-x86-32/sonar.sh b/sonar-application/src/main/assembly/bin/linux-x86-32/sonar.sh
index c080399c62c706e60a027bb665b684e86602c1da..aa02bd8703286bd03024c60e4d506c8907acce68 100755 (executable)
--- a/sonar-application/src/main/assembly/bin/linux-x86-32/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/linux-x86-32/sonar.sh
@@ -334,6 +334,7 @@ checkUser() {
         # Still want to change users, recurse.  This means that the user will only be
         #  prompted for a password once. Variables shifted by 1
         su -m $RUN_AS_USER -c "\"$REALPATH\" $2"
+        RETVAL=$?
 
         # Now that we are the original user again, we may need to clean up the lock file.
         if [ "X$LOCKPROP" != "X" ]
@@ -349,7 +350,7 @@ checkUser() {
             fi
         fi
 
-        exit 0
+        exit $RETVAL
     fi
 }
 

diff --git a/sonar-application/src/main/assembly/bin/linux-x86-64/sonar.sh b/sonar-application/src/main/assembly/bin/linux-x86-64/sonar.sh
index c080399c62c706e60a027bb665b684e86602c1da..aa02bd8703286bd03024c60e4d506c8907acce68 100755 (executable)
--- a/sonar-application/src/main/assembly/bin/linux-x86-64/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/linux-x86-64/sonar.sh
@@ -334,6 +334,7 @@ checkUser() {
         # Still want to change users, recurse.  This means that the user will only be
         #  prompted for a password once. Variables shifted by 1
         su -m $RUN_AS_USER -c "\"$REALPATH\" $2"
+        RETVAL=$?
 
         # Now that we are the original user again, we may need to clean up the lock file.
         if [ "X$LOCKPROP" != "X" ]
@@ -349,7 +350,7 @@ checkUser() {
             fi
         fi
 
-        exit 0
+        exit $RETVAL
     fi
 }
 

diff --git a/sonar-application/src/main/assembly/bin/macosx-universal-32/sonar.sh b/sonar-application/src/main/assembly/bin/macosx-universal-32/sonar.sh
index 6ad48536cc53510a80646b164ef887c45a287628..525cf6053eef94fb24e8285bafc369143a5fce3f 100755 (executable)
--- a/sonar-application/src/main/assembly/bin/macosx-universal-32/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/macosx-universal-32/sonar.sh
@@ -334,6 +334,7 @@ checkUser() {
         # Still want to change users, recurse.  This means that the user will only be
         #  prompted for a password once. Variables shifted by 1
         su -m $RUN_AS_USER -c "\"$REALPATH\" $2"
+        RETVAL=$?
 
         # Now that we are the original user again, we may need to clean up the lock file.
         if [ "X$LOCKPROP" != "X" ]
@@ -349,7 +350,7 @@ checkUser() {
             fi
         fi
 
-        exit 0
+        exit $RETVAL
     fi
 }
 

diff --git a/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh b/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh
index 6ad48536cc53510a80646b164ef887c45a287628..525cf6053eef94fb24e8285bafc369143a5fce3f 100755 (executable)
--- a/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/macosx-universal-64/sonar.sh
@@ -334,6 +334,7 @@ checkUser() {
         # Still want to change users, recurse.  This means that the user will only be
         #  prompted for a password once. Variables shifted by 1
         su -m $RUN_AS_USER -c "\"$REALPATH\" $2"
+        RETVAL=$?
 
         # Now that we are the original user again, we may need to clean up the lock file.
         if [ "X$LOCKPROP" != "X" ]
@@ -349,7 +350,7 @@ checkUser() {
             fi
         fi
 
-        exit 0
+        exit $RETVAL
     fi
 }
 

diff --git a/sonar-application/src/main/assembly/bin/solaris-sparc-32/sonar.sh b/sonar-application/src/main/assembly/bin/solaris-sparc-32/sonar.sh
index 154e328921832fa6ee8925f406295c0c83107815..b7ea5df58b65b1a57f8babae27a5a8c3f64e1fa0 100755 (executable)
--- a/sonar-application/src/main/assembly/bin/solaris-sparc-32/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/solaris-sparc-32/sonar.sh
@@ -335,6 +335,7 @@ checkUser() {
         # Still want to change users, recurse.  This means that the user will only be
         #  prompted for a password once. Variables shifted by 1
         su -m $RUN_AS_USER -c "\"$REALPATH\" $2"
+        RETVAL=$?
 
         # Now that we are the original user again, we may need to clean up the lock file.
         if [ "X$LOCKPROP" != "X" ]
@@ -350,7 +351,7 @@ checkUser() {
             fi
         fi
 
-        exit 0
+        exit $RETVAL
     fi
 }
 

diff --git a/sonar-application/src/main/assembly/bin/solaris-sparc-64/sonar.sh b/sonar-application/src/main/assembly/bin/solaris-sparc-64/sonar.sh
index 154e328921832fa6ee8925f406295c0c83107815..b7ea5df58b65b1a57f8babae27a5a8c3f64e1fa0 100755 (executable)
--- a/sonar-application/src/main/assembly/bin/solaris-sparc-64/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/solaris-sparc-64/sonar.sh
@@ -335,6 +335,7 @@ checkUser() {
         # Still want to change users, recurse.  This means that the user will only be
         #  prompted for a password once. Variables shifted by 1
         su -m $RUN_AS_USER -c "\"$REALPATH\" $2"
+        RETVAL=$?
 
         # Now that we are the original user again, we may need to clean up the lock file.
         if [ "X$LOCKPROP" != "X" ]
@@ -350,7 +351,7 @@ checkUser() {
             fi
         fi
 
-        exit 0
+        exit $RETVAL
     fi
 }
 

diff --git a/sonar-application/src/main/assembly/bin/solaris-x86-32/sonar.sh b/sonar-application/src/main/assembly/bin/solaris-x86-32/sonar.sh
index 98ba3efd301bc1a77c5c92e10176ce35b4b07e6e..8848cfa9ba51d5b0c1acf462bac70a15e60a3ce2 100755 (executable)
--- a/sonar-application/src/main/assembly/bin/solaris-x86-32/sonar.sh
+++ b/sonar-application/src/main/assembly/bin/solaris-x86-32/sonar.sh
@@ -334,6 +334,7 @@ checkUser() {
         # Still want to change users, recurse.  This means that the user will only be
         #  prompted for a password once. Variables shifted by 1
         sudo -u $RUN_AS_USER "$REALPATH" "$2"
+        RETVAL=$?
 
         # Now that we are the original user again, we may need to clean up the lock file.
         if [ "X$LOCKPROP" != "X" ]
@@ -349,7 +350,7 @@ checkUser() {
             fi
         fi
 
-        exit 0
+        exit $RETVAL
     fi
 }