Export the 'short_source' function & don't keep PS4 in sudo

John L. Villalovos · John L. Villalovos · commit daa7a41e219f · 2016-05-06T10:50:58.000-07:00
Export the 'short_source' function so that it will be present in the
environment for child shell scripts. Do this because we are passing PS4
to the child shell scripts and it is using 'short_source'

Don't do an 'env_keep' in the sudoers file for PS4, since it is
difficult to also pass along the 'short_source' function.

Change-Id: I9781010d6eb336d02939c7fd47f18bedeae5ccc6
Closes-Bug: #1563443
diff --git a/functions b/functions
@@ -41,6 +41,9 @@ function short_source {
     file=${file#$RC_DIR/}
     printf "%-40s " "$file:${called[1]}:${called[0]}"
 }
+# PS4 is exported to child shells and uses the 'short_source' function, so
+# export it so child shells have access to the 'short_source' function also.
+export -f short_source
 
 
 # Retrieve an image from a URL and upload into Glance.
diff --git a/stack.sh b/stack.sh
@@ -240,7 +240,6 @@ echo "$STACK_USER ALL=(root) NOPASSWD:ALL" >$TEMPFILE
 # see them by forcing ``PATH``
 echo "Defaults:$STACK_USER secure_path=/sbin:/usr/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin" >> $TEMPFILE
 echo "Defaults:$STACK_USER !requiretty" >> $TEMPFILE
-echo "Defaults env_keep += PS4" >> $TEMPFILE
 chmod 0440 $TEMPFILE
 sudo chown root:root $TEMPFILE
 sudo mv $TEMPFILE /etc/sudoers.d/50_stack_sh
diff --git a/tools/create_userrc.sh b/tools/create_userrc.sh
@@ -22,6 +22,9 @@ function short_source {
     file=${file#$RC_DIR/}
     printf "%-40s " "$file:${called[1]}:${called[0]}"
 }
+# PS4 is exported to child shells and uses the 'short_source' function, so
+# export it so child shells have access to the 'short_source' function also.
+export -f short_source
 
 set -o xtrace
 

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,9 @@ function short_source {`
`41`	`41`	`file=${file#$RC_DIR/}`
`42`	`42`	`printf "%-40s " "$file:${called[1]}:${called[0]}"`
`43`	`43`	`}`
	`44`	`+# PS4 is exported to child shells and uses the 'short_source' function, so`
	`45`	`+# export it so child shells have access to the 'short_source' function also.`
	`46`	`+export -f short_source`
`44`	`47`
`45`	`48`
`46`	`49`	`# Retrieve an image from a URL and upload into Glance.`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ function short_source {`
`22`	`22`	`file=${file#$RC_DIR/}`
`23`	`23`	`printf "%-40s " "$file:${called[1]}:${called[0]}"`
`24`	`24`	`}`
	`25`	`+# PS4 is exported to child shells and uses the 'short_source' function, so`
	`26`	`+# export it so child shells have access to the 'short_source' function also.`
	`27`	`+export -f short_source`
`25`	`28`
`26`	`29`	`set -o xtrace`
`27`	`30`