X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-libraries.git;a=blobdiff_plain;f=testdata%2Fscripts%2Fpnd_run.sh;h=c6cdc9bcd46acefc563c95c3b02f271a77479d75;hp=62b8ebb05807c4c5863d04fe6126b63826238e7f;hb=a2006173780c382153fd079fcc7ac353226ea1f6;hpb=fb72a850a1074877058fd56dbd2f76f042ec1783

diff --git a/testdata/scripts/pnd_run.sh b/testdata/scripts/pnd_run.sh
index 62b8ebb..c6cdc9b 100755
--- a/testdata/scripts/pnd_run.sh
+++ b/testdata/scripts/pnd_run.sh
@@ -135,7 +135,7 @@ PND_Exec() {
 showHelp() {
 	cat <<endHELP
 Usage:
-  pnd_run.sh -p file.pnd -e cmd [-a args] [-b pndid] [-s path] [-c speed] [-d [path]] [-x] [-m] [-u]
+  pnd_run.sh -p file.pnd -e cmd [-a args] [-b pndid] [-s path] [-c speed] [-d [path]] [-x] [-m] [-u] [-- more_args]
     -p file.pnd	: Specify the pnd file to execute
     -e cmd	: Command to run
     -a args	: Arguments to the command
@@ -146,6 +146,9 @@ Usage:
     -x		: Stop X before starting the apps
     -m		: Only mount the pnd, dont run it (-e become optional)
     -u		: Only umount the pnd, dont run it (-e become optional)
+
+  If '--' is specified, all subsequent arguments are passed through to the command
+  (useful if you want to pass quotes and weird chars to the command)
 endHELP
 }
 
@@ -259,7 +262,7 @@ PND_RestartX(){
 show_mounted_info(){
 	echo "+++++++"
 	echo "Loopback devices :"
-	sudo losetup -a
+	sudo /sbin/losetup -a
 	echo "Are mounted on :"
 	mount|grep loop
 	echo "For these Union :"
@@ -287,7 +290,7 @@ mountPnd() {
 	MOUNT_TARGET="${1:-$PND_MOUNT_DIR}"
 	if ! is_pnd_mounted;then
 		#check if pnd is already attached to loop 
-		LOOP=$(losetup -a | grep "$PND" | tail -n1 | awk -F: '{print $1}')
+		LOOP=$(/sbin/losetup -a | grep "$PND" | tail -n1 | awk -F: '{print $1}')
 		#check if the loop device is already mounted
 		if ! [ -z "$LOOP" ];then
 			echo "Found a loop ($LOOP), using it"
@@ -314,8 +317,8 @@ mountPnd() {
 			#detect fs
 			case $PND_FSTYPE in
 			ISO)
-				/sbin/losetup $FREELOOP "$PND" #attach the pnd to the loop device
-				mntline="mount" #setup the mountline for later
+				/sbin/losetup -r $FREELOOP "$PND" #attach the pnd to the loop device
+				mntline="mount -o ro" #setup the mountline for later
 				mntdev="${FREELOOP}"
 				;;
 			directory)
@@ -325,8 +328,8 @@ mountPnd() {
 				mntdev="${PND}"
 				;;
 			Squashfs)
-				/sbin/losetup $FREELOOP "$PND" #attach the pnd to the loop device
-				mntline="mount -t squashfs"
+				/sbin/losetup -r $FREELOOP "$PND" #attach the pnd to the loop device
+				mntline="mount -t squashfs -o ro"
 				mntdev="${FREELOOP}"
 				;;
 			*)
@@ -443,11 +446,11 @@ cleanups() {
 
 	# Clean the loopback device
 	if [ $PND_FSTYPE = ISO ] || [ $PND_FSTYPE = Squashfs ]; then # check if we where running an iso, clean up loop device if we did
-		LOOP=$(losetup -a | grep "$(basename $PND)" | tail -n1 | awk -F: '{print $1}')
+		LOOP=$(/sbin/losetup -a | grep "$(basename $PND)" | tail -n1 | awk -F: '{print $1}')
 		/sbin/losetup -d $LOOP
 		#rm $LOOP
 	fi
-	losetup -a|cut -d':' -f 1|while read l;do
+	/sbin/losetup -a|cut -d':' -f 1|while read l;do
 		if ! mount|grep -q $l;then
 			echo "WARNING Found $l loop as unused. flushing"
 			/sbin/losetup -d $l
@@ -536,12 +539,16 @@ runApp() {
 	        export XDG_DATA_DIRS="$UNION_MOUNT_DIR/$PND_NAME/share:$XDG_DATA_DIRS:/usr/share"
 	fi
 
-	export XDG_CONFIG_HOME="$UNION_MOUNT_DIR/$PND_NAME"
+	export REAL_HOME="$HOME"
+	export HOME="$UNION_MOUNT_DIR/$PND_NAME"
+	export XDG_CONFIG_HOME="$HOME"
+	export XDG_DATA_HOME="$HOME"
+	export XDG_CACHE_HOME="$HOME"
 
 	if echo "$EXENAME"|grep -q ^\.\/;then
-		"$EXENAME" $ARGUMENTS
+		"$EXENAME" $ARGUMENTS "$@"
 	else
-		"./$EXENAME" $ARGUMENTS
+		"./$EXENAME" $ARGUMENTS "$@"
 	fi
 	RC=$?
 
@@ -551,6 +558,7 @@ runApp() {
 		sleep 10s
 		PID=`pidof -o %PPID -x \"$EXENAME\"`
 	done
+	export HOME="$REAL_HOME"
 	return $RC
 }
 
@@ -582,14 +590,17 @@ main() {
 			PND_EndTask
 		fi
 		oPWD=$(pwd)
+		old_fb0_geometry=$(fbset -fb /dev/fb0 -s | grep geometry | awk '{print $2, $3, $4, $5, $6}')
 		if [ -e "${APPDATADIR}/PND_pre_script.sh" ]; then
 			PND_BeginTask "Starting user configured pre-script"
 			. ${APPDATADIR}/PND_pre_script.sh # Sourcing so it can shared vars with post-script ;)
 			PND_EndTask
 		fi
-		PND_BeginTask "Starting the application ($EXENAME $ARGUMENTS)"
-		runApp
+
+		PND_BeginTask "Starting the application ( $EXENAME $ARGUMENTS "$@")"
+		runApp "$@"
 		PND_EndTask
+
 		if [ -e "${APPDATADIR}/PND_post_script.sh" ]; then
 			PND_BeginTask "Starting user configured post-script"
 			. ${APPDATADIR}/PND_post_script.sh
@@ -606,6 +617,26 @@ main() {
 			PND_resetCPUSpeed
 			PND_EndTask
 		fi
+		PND_BeginTask "Restoring the frame buffer status"
+		ofbset -fb /dev/fb0 -pos 0 0
+		fbset -fb /dev/fb0 -g $old_fb0_geometry
+		old_res=$(echo $old_fb0_geometry | awk '{print $1, $2}')
+		ofbset -fb /dev/fb0 -size $old_res -en 1
+		if ! lsof /dev/fb1 > /dev/null; then
+			ofbset -fb /dev/fb1 -mem 0 -size 0 0 -en 0
+		fi
+		PND_EndTask
+
+		running_pnd_count=$(ps ax | grep "pnd_run.s[h]" | wc -l)
+		# restore settings if we are the last exiting pnd
+		# compare with 2 because one is used by subshell where "ps ax | ..." runs
+		if [ "$running_pnd_count" -eq "2" ]; then
+			PND_BeginTask "Restoring nub mode"
+			sed -n '1p' /etc/pandora/conf/nubs.state > /proc/pandora/nub0/mode
+			sed -n '7p' /etc/pandora/conf/nubs.state > /proc/pandora/nub1/mode
+			PND_EndTask
+		fi
+
 		PND_BeginTask "uMount the PND"
 		umountUnion
 		PND_EndTask
@@ -616,8 +647,18 @@ main() {
 ######################################################################################
 ####	Parsing the arguments :
 ##
+if [ "$#" -lt 1 ]; then
+	showHelp
+	exit 1
+fi
+
 ACTION=run
 while [ "$#" -gt 0 ];do
+	if [ "$1" == "--" ]; then
+		shift
+		break
+	fi
+
 	if [ "$#" -gt 1 ] && ( [[ "$(echo $2|cut -c 1)" != "-" ]] || [[ "$1" = "-a" ]] );then
         	case "$1" in
                 -p) PND="$2";;
@@ -629,7 +670,6 @@ while [ "$#" -gt 0 ];do
                 -d) APPDATASET=1;APPDATADIR="$2";;
                 -a) ARGUMENTS="$2";;
                 *)	echo "ERROR while parsing arguments: \"$1 $2\" is not a valid argument"; 
-			echo "Arguments were : $PND_ARGS"
 			showHelp;
 			exit 1 ;;
         	esac
@@ -641,7 +681,6 @@ while [ "$#" -gt 0 ];do
                 -x) CLOSE_X=1;;
                 -d) APPDATASET=1;;
                 *)	echo "ERROR while parsing arguments: \"$1\" is not a valid argument"; 
-			echo "Arguments were : $PND_ARGS"
 			showHelp;
 			exit 1 ;;
         	esac
@@ -650,6 +689,12 @@ while [ "$#" -gt 0 ];do
 	fi
 done
 
+if test -z "$PND"; then
+	echo "ERROR: pnd file provided (-p)"
+	showHelp
+	exit 1
+fi
+
 # getting the real full path to the file
 PND="$(readlink -f $PND)"
 
@@ -670,7 +715,7 @@ if [ ! -e "$PND" ]; then #check if theres a pnd suplied, need to clean that up a
 fi
 
 if [ ! "$EXENAME" ] && [[ "$ACTION" = "run" ]]; then
-	echo "ERROR: no executable name provided!"
+	echo "ERROR: no executable name provided! (-e)"
 	showHelp
 	exit 1
 fi
@@ -696,10 +741,10 @@ if [[ "$ACTION" == "run" ]];then
 	PND_Start
 	{
 	if [ $CLOSE_X ]; then
-		main 2>&1 & 
+		main "$@" 2>&1 & 
 		disown
 	else
-		main 2>&1
+		main "$@" 2>&1
 	fi
 	}>>"$PND_LOG"
 	PND_Stop