[MAPPASM-113] Exit code is not properly returned when using RUN_AS_USER

git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/appassembler@13432 52ab4f32-60fc-0310-b215-8acea882cd1b
mojohaus · Jan 21, 2011 · 25b9149 · 25b9149
1 parent 6a64f2b
commit 25b9149
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/appassembler-maven-plugin/src/main/patches/sh.script.in b/appassembler-maven-plugin/src/main/patches/sh.script.in
@@ -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/...st/resources/org/codehaus/mojo/appassembler/daemon/jsw/no-generator-configurations-run.sh b/...st/resources/org/codehaus/mojo/appassembler/daemon/jsw/no-generator-configurations-run.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/...embler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/jsw/run-1.sh b/...embler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/jsw/run-1.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/...embler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/jsw/run-8.sh b/...embler-maven-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/jsw/run-8.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
 }