Check-in [bde8c7a2e5]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:bde8c7a2e5eb30fa73b443e8a75f9d26d589931b
Date: 2012-02-22 00:05:37
User: BarryK
Comment:npierce: fix /usr/local/petget/check_deps.sh when many pkgs, fix for _ in pkg name

Tags And Properties
Changes

Changes to woof-code/boot/boot-dialog/help2.msg

@@ -1,19 +1,19 @@
 
 0bPress <F2> key to go to basic help07
 If you need particular boot options, type0c BOOTLABEL07 then a space,
 then each boot option. Some boot options:
 
-0bThe following are mostly in GRUB/Syslinux setup for installed Puppy. Files are
-found automatically at bootup but these can help the 'init' script. Examples:07
+0bThese help locating files at bootup. Examples:07
 0cpdev1=sdc107      The boot partition.
 0cpsubdir=puppies/wary50107 Path in which Puppy is installed.
 0cpsavemark=207     Partition no. (in boot drive) to save session to.
 0cpmedia=usbflash07 Type of media booting from. Choose one of these:
              usbflash usbhd usbcd ataflash atahd atacd atazip scsihd scsicd cd
 0cpupsfs=sdc1:/puppies/wary501/puppy.sfs07 Override auto search.
 0czdrv=sdc1:/puppies/wary501/zdrv.sfs07    Override auto search.
+0cunderdog=sda907   Mount an entire Linux distro (in sda9) underneath Puppy.
 
 0bThe following are for debugging, for experts only:07
 0cloglevel=<n>07    Bootup verbosity. 7 is high verbosity for debugging.
 0cpfix=rdsh07       Execute 'init' then dropout to prompt in initramfs.
 0cpfix=rdsh007      Dropout early, before loading kernel drivers.

Changes to woof-code/rootfs-skeleton/usr/local/petget/check_deps.sh

@@ -7,10 +7,11 @@
 #100830 missing libs, but some pkgs have a startup script that makes some libs visible.
 #101220 reported missing 'alsa-lib' but wary has 'alsa-lib21a', quick hack fix.
 #101221 yaf-splash fix.
 #110706 finding missing dependencies fix (running mageia 1).
 #120203 BK: internationalized.
+#120222 npierce: use list widget, support '_' in name.
 
 export TEXTDOMAIN=petget___check_deps.sh
 export OUTPUT_CHARSET=UTF-8
 
 . /etc/DISTRO_SPECS #has DISTRO_BINARY_COMPAT, DISTRO_COMPAT_VERSION
@@ -151,49 +152,46 @@
  while read ONEPKGSPEC
  do
   [ "$ONEPKGSPEC" = "" ] && continue
   ONEPKG="`echo -n "$ONEPKGSPEC" | cut -f 1 -d '|'`"
   ONEDESCR="`echo -n "$ONEPKGSPEC" | cut -f 2 -d '|'`"
-  echo "<radiobutton><label>${ONEPKG} DESCRIPTION: ${ONEDESCR}</label><variable>RADIO_${ONEPKG}</variable></radiobutton>" >> /tmp/petget_depchk_buttons
+  #120222 npierce: replaced radiobuttons with list and items
+  echo "<item>${ONEPKG} DESCRIPTION: ${ONEDESCR}</item>" >> /tmp/petget_depchk_buttons
  done
  RADBUTTONS="`cat /tmp/petget_depchk_buttons`"
- if [ "$RADBUTTONS" != "" ];then #100902 test if too many installed pkgs
-  nRADBUT=`echo "$RADBUTTONS" | wc -l`
-  if [ $nRADBUT -gt 23 ];then
-   #layout as two columns...
-   RADBUTTONS1="`cat /tmp/petget_depchk_buttons | head -n 23`"
-   RADBUTTONS2="`cat /tmp/petget_depchk_buttons | tail -n +24`"
-   RADBUTTONS="<hbox><vbox>${RADBUTTONS1}</vbox><vbox>${RADBUTTONS2}</vbox></hbox>"
-  fi
- fi
  if [ "$RADBUTTONS" = "" ];then
   ACTIONBUTTON=""
-  RADBUTTONS="<text use-markup=\"true\"><label>\"<b>$(gettext "No packages installed by user, click 'Cancel' button")</b>\"</label></text>"
+  RADBUTTONS="<item>$(gettext "No packages installed by user, click 'Cancel' button")</item>"
  fi
  export DEPS_DIALOG="<window title=\"$(gettext 'Puppy Package Manager')\" icon-name=\"gtk-about\">
   <vbox>
    <text><label>$(gettext 'Please choose what package you would like to check the dependencies of:')</label></text>
    <frame $(gettext 'User-installed packages')>
-   ${RADBUTTONS}
+    <list selection-mode=\"2\">
+     <variable>LIST</variable>
+     ${RADBUTTONS}
+    </list>
    </frame>
    <hbox>
     ${ACTIONBUTTON}
     <button cancel></button>
    </hbox>
   </vbox>
  </window>
 "
- RETPARAMS="`gtkdialog3 --program=DEPS_DIALOG`"
+ #RETPARAMS="`gtkdialog3 --program=DEPS_DIALOG`"
+ RETPARAMS="`gtkdialog3 --geometry=630x327 --program=DEPS_DIALOG`" #120222
  #ex returned:
- #RADIO_audacious-1.5.1="true"
+ #LIST="audacious-1.5.1"
  #EXIT="BUTTON_CHK_DEPS"
 
  #eval "$RETPARAMS"
  #[ "$EXIT" != "BUTTON_CHK_DEPS" ] && exit
  [ "`echo "$RETPARAMS" | grep 'BUTTON_CHK_DEPS'`" = "" ] && exit
 
- APKGNAME="`echo "$RETPARAMS" | grep '^RADIO_' | grep '"true"' | cut -f 1 -d '=' | cut -f 2 -d '_'`"
+ #120222 npierce: Allow '_' in package name.  CAUTION: Names must not contain spaces.
+ APKGNAME="`echo "$RETPARAMS" | grep '^LIST=' | cut -f 1 -d ' ' | cut -f 2 -d '"'`" #'geanyfix
  dependcheckfunc
 
 fi
 
 missingpkgsfunc