Support for savefolder in puppyinstaller and partview.

This is based on modifications suggested by puppy forum member shinobar
see http://www.murga-linux.com/puppy/viewtopic.php?p=780175#780175

woof-code/rootfs-skeleton/usr/sbin/partview

@@ -47,22 +47,20 @@ do
  fi
  AFS="`echo -n "$APART" | cut -f 2 -d '|'`"
  AFPATTERN="^/dev/$ATAG "
- AUSED=`df -k | grep "$AFPATTERN" | tr -s " " | cut -f 3 -d " "`
+ AUSED=`df -k | grep "$AFPATTERN" | head -n 1 | tr -s " " | cut -f 3 -d " "`
  if [ ! "$AUSED" ];then
   MNTSTATUS='(not mounted)'
   mkdir -p /mnt/$ATAG
   mount -t $AFS /dev/$ATAG /mnt/$ATAG > /dev/null 2>&1
   if [ $? -eq 0 ];then
-   AUSED=`df -k | grep "$AFPATTERN" | tr -s " " | cut -f 3 -d " "`
+   AUSED=`df -k | grep "$AFPATTERN" | head -n 1 | tr -s " " | cut -f 3 -d " "`
    umount /dev/$ATAG
   else
    continue
   fi
  fi
 
  AFREE=`expr $ASIZE - $AUSED`
- nAUSED=`expr $BOXWIDTH \* $AUSED \/ $ASIZE` #normalise.
- [ $nAUSED -eq 0 ] && nAUSED=1
  #process size...
  if [ $AFREE -gt 1048576 ];then #1024*1024
   ONEFREE="`dc $AFREE 1048576 \/ p`"

woof-code/rootfs-skeleton/usr/sbin/puppyinstaller

@@ -99,7 +99,7 @@ ispupfunc() { #two params: fstype partition
  PUPVEROLD='0.0' #110422
  [ ! $2 ] && return 0
  mkdir -p /mnt/$2
- ISPUPMNTPT="`mount | grep "^/dev/$2" | tr -s " " | cut -f 3 -d " "`"
+ ISPUPMNTPT="`mount | grep "^/dev/$2" | head -n 1 |tr -s " " | cut -f 3 -d " "`"
  if [ "$ISPUPMNTPT" = "" ];then
   ISPUPMNTPT="/mnt/$2"
   mount -t $1 /dev/$2 /mnt/$2
@@ -584,13 +584,13 @@ fi
 #sanity check...
 SANITYPART="`echo -n "$RETTXT" | grep '^EXIT' | cut -f 2 -d '"' | cut -f 2 -d '_'`" #'geany
 smPTN="^/dev/${SANITYPART} " #111011
-SANITYMNTPT="`mount | grep "$smPTN" | tr -s " " | cut -f 3 -d " "`"
+SANITYMNTPT="`mount | grep "$smPTN" | head -n 1 | tr -s " " | cut -f 3 -d " "`"
 
 if [ ! "$SANITYMNTPT" = "" ];then
  SANITYMSG1="$SANITYPART $(gettext 'currently mounted, need to unmount it!!!')"
  SANITYMSG2="$SANITYPART $(gettext 'currently mounted read-write.')"
  SANITYMSG3="`eval_gettext \"\\\$SANITYPART does not have \\\${DISTRO_FILE_PREFIX}save.3fs file in it.\"`"
- SANITYRORW="`mount | grep "/$SANITYPART" | tr -s " " | cut -f 6 -d " "`"
+ SANITYRORW="`mount | grep "/$SANITYPART" | head -n 1 | tr -s " " | cut -f 6 -d " "`"
  [ ! "`echo -n "$SANITYMNTPT" | grep "/initrd/"`" = "" ] && SANITYMSG1="$SANITYPART $(gettext 'cannot be unmounted!')"
  [ "$SANITYRORW" = "(ro)" ] && SANITYMSG2="$SANITYPART $(gettext 'is mounted read-only!')"
  [ -f $SANITYMNTPT/${DISTRO_FILE_PREFIX}save.3fs ] && SANITYMSG3="`eval_gettext \"\\\$SANITYPART has personal file \\\${DISTRO_FILE_PREFIX}save.3fs in it!\"`"
@@ -1130,7 +1130,7 @@ Click OK to quit...\"`"
   #SRCPATH where to get vmlinuz, initrd, ${DISTRO_PUPPYSFS}, PUPVEROLD is old puppy version in
   #format 200 (without dots) =0 if no prior installed puppy,
   #NEWVER is new puppy version, DESTSIZM is size of dest partition in Mb (real number),
-  DESTMNTPT="`mount | grep "/dev/${DESTPART} " | tr -s " " | cut -f 3 -d " "`" #120310 
+  DESTMNTPT="`mount | grep "/dev/${DESTPART} " | head -n 1 | tr -s " " | cut -f 3 -d " "`" #120310 
   #120310 er, i think this only needed for older version of ntfs-3g. harmless with latest ntfs-3g...
   [ "$DESTMNTPT" = "" ] && DESTMNTPT="`ps -e | grep -o 'ntfs\-3g.*' | grep "/dev/${DESTPART} " | tr '\t' ' ' | tr -s ' ' | tr ' ' "\n" | grep '^/mnt/'`" #120310