(old)Puppy Linux Discussion Forum

Code: Select all

# ./puppyinstaller

** ERROR **: gtkdialog: Error in line 1, near token '(null)': syntax error

aborting...
./puppyinstaller: line 589: [: too many arguments

** ERROR **: gtkdialog: Error in line 1, near token '(null)': syntax error

aborting...
# 

Code: Select all

--- /root/xorgwizard-orig	2011-09-11 01:31:33.000000000 +0100
+++ /usr/sbin/xorgwizard	2011-09-25 13:35:55.443178122 +0100
@@ -238,7 +238,7 @@
  <vbox>
   <frame XorgWizard>
   <hbox>
-   <text><label>XorgWizard completely reconstructs the /etc/X11/xorg.conf file, and X must not be running to do this. A reboot is required, and the Wizard will run in text mode, before X is launched.</label></text>
+   <text><label>XorgWizard completely reconstructs the /etc/X11/xorg.conf file, and X must not be running to do this. Pressing this button will shutdown the current Xserver $CURRENTX and the Wizard will run in text mode, before X is launched again. Please close all applications !</label></text>
    <vbox>
     <button>
      <input file>/usr/local/lib/X11/mini-icons/wizard16.xpm</input>
@@ -246,7 +246,8 @@
     </button>
    </vbox>
   </hbox>
-  <text><label>NOTE: You can also run XorgWizard manually, without rebooting, by exiting from X to the commandline (see Shutdown menu) then run xorgwizard.</label></text>
+  <text><label>NOTE 1 : You can also run XorgWizard manually , by exiting from X to the commandline (see Shutdown menu) then run xorgwizard .</label></text>
+  <text><label>NOTE 2 : If you have the commonly used Xvesa server installed in /usr/bin/ folder , this button does not run the Wizard but automatically starts the Xvesa X-Server .</label></text>
   </frame>
 
   <frame Edit xorg.conf>
@@ -325,11 +326,17 @@
   11) #XorgWizard.
    #rm /etc/mousedevice # Dougal: any reason for this?
    mv -f /etc/X11/xorg.conf /etc/X11/xorg.conf.prev 2>/dev/null
-   [ -e /usr/bin/Xvesa ] && ln -sf Xvesa /usr/bin/X
+   
    NEXTWM="`cat /etc/windowmanager`"
    echo -n "$NEXTWM" > /etc/windowmanager #this makes change permanent.
+   if [ -e /usr/bin/Xvesa ] ; then ##&& 
+   ln -sf Xvesa /usr/bin/X
    echo -n "$NEXTWM" > /tmp/wmexitmode.txt
+   else
+   echo -n "xorgwizard" > /tmp/wmexitmode.txt
+   fi
    sync
+   sleep 2s
    exec killall X
    ;;
   12) #xorgconfig

Code: Select all

--- /root/xwin-orig	2011-08-07 14:40:41.000000000 +0100
+++ /usr/bin/xwin	2011-09-25 13:24:19.503197507 +0100
@@ -582,6 +582,7 @@
  #rm -f /tmp/wmexitmode.txt ...no, removed in rc.shutdown.
  [ "$WMEXITMODE" = "poweroff" ] && exec /sbin/poweroff #see /usr/bin/wmpoweroff
  [ "$WMEXITMODE" = "reboot" ] && exec /sbin/reboot #see /usr/bin/wmreboot
+ [ "$WMEXITMODE" = "xorgwizard" ] && exec xorgwizard ##krg
  #restart window manager...
  #make a gross assumption, if wmexitmode.txt exists, haven't already exited this script, then want
  #to restart maybe with different window manager. /etc/windowmanager already has desired w.m.

Code: Select all

--- /initrd/pup_ro2/usr/sbin/resizepfile.sh	2010-09-13 11:25:39.000000000 +0100
+++ /usr/sbin/resizepfile.sh	2011-09-26 19:58:25.000000000 +0100
@@ -116,7 +116,8 @@ case ${REPLYX} in
    ;;
 esac
 
-echo -n "$KILOBIG" > /initrd${PUP_HOME}/pupsaveresize.txt
+SAVEFILEONLY=`echo "$PUPSAVE" | sed 's/^[[:blank:]]*//g' | cut -f 3 -d ','`
+echo -n "$KILOBIG,$SAVEFILEONLY" > /initrd${PUP_HOME}/pupsaveresize.txt
 
 xmessage -center -bg "orange" -title "Resize personal storage file" "Okay, you have chosen to increase $NAMEPFILE by $KILOBIG Kbytes,
 however as the file is currently in use, it will happen at reboot.

Code: Select all

--- /mnt/home/RACY_01/INITRD/initrd.d/init.original	2011-09-23 22:48:28.000000000 +0100
+++ /root/init	2011-09-26 19:58:09.000000000 +0100
@@ -885,12 +885,15 @@ if [ "$CREATEPUPSAVE2FS" != "" ];then
     #v3.01 will take this out as a func later (similar code below)...
     #about to mount ${DISTRO_FILE_PREFIX}save.2fs, but before that check if need to resize it...
     if [ -f /mnt/dev_save/pupsaveresize.txt ];then #created by /usr/sbin/resizepfile.sh
-     KILOBIG=`cat /mnt/dev_save/pupsaveresize.txt`
+     KILOBIG=`cat /mnt/dev_save/pupsaveresize.txt | sed 's/^[[:blank:]]*//g' | cut -f 1 -d ','` ##KRG
+     SAVEFILERESIZEFILE=`cat /mnt/dev_save/pupsaveresize.txt | sed 's/^[[:blank:]]*//g' | cut -f 2 -d ','` ##KRG
+      if [ "$PUPSAVEFILE" = "$SAVEFILERESIZEFILE" ] ; then ##KRG
      rm -f /mnt/dev_save/pupsaveresize.txt
      echo > /dev/console
      echo -n "Increasing $PUPSAVEFILE by $KILOBIG Kbytes, please wait..." >/dev/console
      dd if=/dev/zero bs=1024 count=$KILOBIG >> /mnt/dev_save$PUPSAVEFILE
      sync
+      fi  ##KRG
      if [ "$CRYPTO" = "-e aes" ];then #v3.98
       echo "NOTICE: As you type your password nothing will be displayed on the" >/dev/console
       echo "screen for absolute security. Just type it in then press ENTER key..." >/dev/console
@@ -947,7 +950,9 @@ if [ "$CREATEPUPSAVE2FS" != "" ];then
   else #pupsave not encrypted.
    #about to mount ${DISTRO_FILE_PREFIX}save.2fs, but before that check if need to resize it...
    if [ -f /mnt/dev_save/pupsaveresize.txt ];then #created by /usr/sbin/resizepfile.sh
-    KILOBIG=`cat /mnt/dev_save/pupsaveresize.txt`
+    KILOBIG=`cat /mnt/dev_save/pupsaveresize.txt | sed 's/^[[:blank:]]*//g' | cut -f 1 -d ','` ##KRG ##edit : changed '-f 2' to '-f 1'
+    SAVEFILERESIZEFILE=`cat /mnt/dev_save/pupsaveresize.txt | sed 's/^[[:blank:]]*//g' | cut -f 2 -d ','` ##KRG
+     if [ "$PUPSAVEFILE" = "$SAVEFILERESIZEFILE" ] ; then  ##KRG
     rm -f /mnt/dev_save/pupsaveresize.txt
     echo > /dev/console
     echo -n "Increasing $PUPSAVEFILE by $KILOBIG Kbytes, please wait..." >/dev/console
@@ -958,6 +963,7 @@ if [ "$CREATEPUPSAVE2FS" != "" ];then
     sync
     check_status 0 #note, e2fsck gives an error even though it works. v2.21 maybe okay now.
     echo -n "...continuing with loading $PUPSAVEFILE..." > /dev/console
+     fi ##KRG
    fi
    losetup /dev/loop1 /mnt/dev_save${PUPSAVEFILE}
    SFFS='ext'`echo -n "$PUPSAVEFILE" | rev | cut -c 3`