nox mode when no x is running wont start x anymore
modified: testdata/scripts/pnd_run.sh
*) echo "Error while parsing arguments!" ; exit 1 ;;
esac
done
*) echo "Error while parsing arguments!" ; exit 1 ;;
esac
done
if [ ! $PND ]; then #check if theres a pnd suplied, need to clean that up a bit more
echo "Usage: pnd_run.sh -p your.pnd -e executeable [-a \"(arguments)\"] [ -s \"cd to folder inside pnd\"] [-b UID (name of mountpoint/pandora/appdata)] [-x close x before launching(script needs to be started with nohup for this to work]"
exit 1
if [ ! $PND ]; then #check if theres a pnd suplied, need to clean that up a bit more
echo "Usage: pnd_run.sh -p your.pnd -e executeable [-a \"(arguments)\"] [ -s \"cd to folder inside pnd\"] [-b UID (name of mountpoint/pandora/appdata)] [-x close x before launching(script needs to be started with nohup for this to work]"
exit 1
+if [ $(pidof X) ]; then
+unset $nox
+fi
+
fork () {
echo in fork!
if [ $nox ]; then #the app doesnt want x to run, so we kill it and restart it once the app quits
fork () {
echo in fork!
if [ $nox ]; then #the app doesnt want x to run, so we kill it and restart it once the app quits
#clean up
sudo rmdir /mnt/utmp/$BASENAME
#clean up
sudo rmdir /mnt/utmp/$BASENAME
+sudo rm /mnt/utmp/$BASENAME
sudo umount /mnt/utmp/$BASENAME #umount union
if [ $? -eq 0 ]; then # check if the umount was successfull, if it wasnt it would mean that theres still something running so we skip this stuff, this WILL lead to clutter if it happens, so we should make damn sure it never happens
#umount the actual pnd
sudo umount /mnt/utmp/$BASENAME #umount union
if [ $? -eq 0 ]; then # check if the umount was successfull, if it wasnt it would mean that theres still something running so we skip this stuff, this WILL lead to clutter if it happens, so we should make damn sure it never happens
#umount the actual pnd
#delete appdata folder and ancestors if empty
sudo rmdir -p $MOUNTPOINT/pandora/appdata/$BASENAME/
#delete tmp mountpoint
#delete appdata folder and ancestors if empty
sudo rmdir -p $MOUNTPOINT/pandora/appdata/$BASENAME/
#delete tmp mountpoint
- sudo rmdir /mnt/utmp/$BASENAME;
+ sudo rmdir /mnt/utmp/$BASENAME
if [ $DFS = ISO ] || [ $DFS = Squashfs ]; then # check if we where running an iso, clean up loop device if we did
if [ $DFS = ISO ] || [ $DFS = Squashfs ]; then # check if we where running an iso, clean up loop device if we did
- LOOP=$(sudo losetup -a | grep $PND | tail -n1 | awk -F: '{print $1}')
+ LOOP=$(sudo losetup -a | grep $(basename $PND) | tail -n1 | awk -F: '{print $1}')
sudo /sbin/losetup -d $LOOP
sudo rm $LOOP
fi
sudo /sbin/losetup -d $LOOP
sudo rm $LOOP
fi
if [ $nox ]; then
echo forking now!
if [ $nox ]; then
echo forking now!
-fork &> /tmp/pndrun$BASENAME.out &
+fork &> /tmp/pndrun$BASENAME$mount.out &
disown
else
echo Running with x, not disowning!
disown
else
echo Running with x, not disowning!
-fork &> /tmp/pndrun$BASENAME.out
+fork &> /tmp/pndrun$BASENAME$mount.out
fi
\ No newline at end of file
fi
\ No newline at end of file