Check-in [cf31283d88]
Not logged in

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

Overview

SHA1 Hash:cf31283d885197929ce7697c1b65dc4d711c0037
Date: 2012-05-12 01:36:54
User: BarryK
Comment:fixed some buglets, ref: forum t=77303&start=105

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/sbin/pup_event_frontend_d

@@ -33,10 +33,11 @@
 #120129 karl godt: fix ZOMBIES, see http://murga-linux.com/puppy/viewtopic.php?t=71767&start=420. see also rc.shutdown, pmount, drive_all.
 #120131 rodin.s: internationalized. BK: note, rodin.s's script different from that in Woof, applied changes line-by-line.
 #120201 more gettext added.
 #120215 rodin.s: gettext fixes on a couple of lines.
 #120503 the label "mmcblk0p1" (SD memory cards via mmc interface) is too long, reduce to "mm0p1".
+#120512 Karl Godt: do not save when compiling, add: make, cc, new2dir.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110513
 
 export TEXTDOMAIN=pup_event_frontend_d
 export OUTPUT_CHARSET=UTF-8
@@ -302,14 +303,10 @@
     xPATTERN=" x=\"${COORD_X}\" y=\"${COORD_Y}\" "
    done
   ;;
  esac
 }
-
-
-
-
 
 add_pinboard_func() { #needs ONEDRVNAME, DRV_CATEGORY, FSTYPE
  #ppPATTERN=' label="'"$ONEDRVNAME"'"'
  #v411 rerwin: avoid icon getting duplicated if it is renamed...
  ppPATTERN="/root/.pup_event/drive_${ONEDRVNAME}<"
@@ -781,11 +778,12 @@
   fi
  fi
  #some apps should not be disturbed by this background stuff...
  RUNPS="`ps`"
  #w482 add xorriso... 111228 added removepreview.sh (in /usr/local/petget) but probably test for "petget" is already enough...
- [ "`echo "$RUNPS" | grep -E 'xorriso|xorrecord|xine|petget|wget|axel|dotpup|mplayer|gcurl|gimv|burniso2cd|growisofs|cdrecord|pcdripper|xfmedia|xmms|ripoff|pdvdrsab|pburn|mhwaveedit|installpkg\.sh|downloadpkgs\.sh|removepreview\.sh'`" != "" ] && continue
+ #120512 Karl Godt: do not save when compiling, add: make, cc, new2dir
+ [ "`echo "$RUNPS" | grep -E 'make|cc|new2dir|xorriso|xorrecord|xine|petget|wget|axel|dotpup|mplayer|gcurl|gimv|burniso2cd|growisofs|cdrecord|pcdripper|xfmedia|xmms|ripoff|pdvdrsab|pburn|mhwaveedit|installpkg\.sh|downloadpkgs\.sh|removepreview\.sh'`" != "" ] && continue
 
  [ "$AUTOUNMOUNT" = "true" ] && auto_unmount_func #v424 automatially unmount a partition if no longer being used (AUTOUNMOUNT set in eventmanager).
 
  #monitor free memory, periodic save of tmpfs top layer...
  case $PUPMODE in

Changes to woof-code/rootfs-skeleton/usr/sbin/shutdownconfig

@@ -19,10 +19,11 @@
 #111110 need to export CRYPTO in /tmp/shutdownconfig_results, for rc.shutdown.
 #120323 replace 'xmessage' with 'pupmessage'.
 #120327 only show "*RECOMMENDED*" partition for savefile if >256MB free.
 #120327 expBOOTDRV needs to be exported to rc.shutdown.
 #120427 01micko: support ext4 in save-file. 120428
+#120512 Karl Godt: some parameters missing from lines 626, 630, 642.
 
 if [ ! $DISPLAY ];then
  export LANG=C #110928 console shutdown using 'dialog', disable i18n.
 else
  export OUTPUT_CHARSET=UTF-8
@@ -558,11 +559,11 @@
 SAVECHOICE=255
 
 # some word processing now...
 T_canceltitle="$(gettext 'Click close-box to cancel shutdown')"
 T_countdown="$(gettext 'Shutdown in TIME seconds')"
-T_savetofile="$(gettext 'SAVE TO A FILE')"
+T_savetofile="$(gettext 'SAVE TO FILE')"
 T_savetopart="`eval_gettext \"SAVE TO \\\${xPDEV}\"`"
 T_orwait240="$(gettext 'Or, wait 240 seconds to shutdown without saving session...')"
 T_save="$(gettext 'SAVE')"
 T_cd="$(gettext 'SAVE TO CD')"
 
@@ -620,15 +621,15 @@
 
 Do you want to create a '\\\${DISTRO_FILE_PREFIX}save.2fs' file? If unsure, it is recommended that you do save the session, so all your personal settings and files will be automatically loaded at next boot.\"`"
   if [ $DISPLAY ];then
    T_display="`eval_gettext \"Click the \Zb\\\${T_save}\ZB button to create '\\\${DISTRO_FILE_PREFIX}save.2fs' and save to it, or click \Zb\\\${T_no}\ZB to not save session...\"`" #111012 fix.
    yesno="$T_ms \n\n$T_display \n\n$T_orwait240"
-   pupdialog --background '#FFFF80' --colors --title "$T_canceltitle" --backtitle "$T_title" --timeout 240 --countdown "$T_countdown" --yes-label "$T_save" --yesno "$yesno" 0 0 >/dev/console
+   pupdialog --background '#FFFF80' --colors --title "$T_canceltitle" --backtitle "$T_title" --timeout 240 --countdown "$T_countdown" --no-label "$T_no" --yes-label "$T_save" --yesno "$yesno" 0 0 >/dev/console #120512
   else
    T_display="`eval_gettext \"Select \Zb\\\${T_save}\ZB (just press ENTER key) to create '\\\${DISTRO_FILE_PREFIX}save.2fs' and save to it, or select \Zb\\\${T_no}\ZB (TAB then ENTER) to not save session...\"`"
    yesno="$T_ms \n\n$T_display \n\n$T_orwait240"
-   dialog --colors --title "$T_title" --timeout 240 --yes-label "$T_save" --yesno "$yesno" 0 0 >/dev/console
+   dialog --colors --title "$T_title" --timeout 240 --no-label "$T_no" --yes-label "$T_save" --yesno "$yesno" 0 0 >/dev/console #120512
   fi
   SAVECHOICE=$?
  ;;
  iso9660)
   T_iso="`eval_gettext \"You have booted off a live-CD or DVD, and you can now save your personal settings and files to a USB Flash drive or any hard drive partition. The session will be saved as a single file, named '\\\${DISTRO_FILE_PREFIX}save.2fs', which has a ext2 (or ext3) filesystem inside it.
@@ -636,11 +637,11 @@
   if [ $DISPLAY ];then
    T_display="`eval_gettext \"Click the \Zb\\\${T_savetofile}\ZB button to choose a partition to save the session as file '\\\${DISTRO_FILE_PREFIX}save.2fs'...
 Click \Zb\\\${T_cd}\ZB button to save session to CD/DVD (multisession) (EXPERIMENTAL)...
 Click \Zb\\\${T_notsave}\ZB to shutdown without saving session...\"`"
    yesno="$T_iso \n\n$T_display \n\n$T_orwait240"
-   pupdialog --background '#FFFF80' --colors --title "$T_canceltitle" --backtitle "$T_title" --timeout 240 --countdown "$T_countdown" --extra-button --ok-label "SAVE TO FILE"  --extra-label "SAVE TO CD" --cancel-label "$T_notsave" --yesno "$yesno" 0 0 >/dev/console
+   pupdialog --background '#FFFF80' --colors --title "$T_canceltitle" --backtitle "$T_title" --timeout 240 --countdown "$T_countdown" --extra-button --ok-label "$T_savetofile"  --extra-label "$T_cd" --cancel-label "$T_notsave" --yesno "$yesno" 0 0 >/dev/console #120512
   else
    T_display="`eval_gettext \"Select <\\\${T_savetofile}> (just press ENTER key) to choose a partition to save the session as file \\\${DISTRO_FILE_PREFIX}save.2fs...
 Select <\\\${T_cd}> (TAB then ENTER) to save session to CD/DVD (multisession) (EXPERIMENTAL)...
 Select <\\\${T_notsave}> to shutdown without saving session...\"`"
    yesno="$T_iso \n\n$T_display \n\n$T_orwait240"

Changes to woof-distro/Packages-puppy-noarch-official

@@ -32,11 +32,11 @@
 gtk_theme_stardust_zigbert-0.5|gtk_theme_stardust_zigbert|0.5||Desktop|45K||gtk_theme_stardust_zigbert-0.5.pet|+gtk+|gtk light blue 3d theme||||
 gtk_theme_stark-1|gtk_theme_stark|1||Desktop|48K||gtk_theme_stark-1.pet|+gtk+|stark black/white theme for gtk, with faint colours and bright orange splashes||||
 hunspell-en-us-2|hunspell-en-us|2||BuildingBlock|732K|pet_packages-quirky|hunspell-en-us-2.pet|+hunspell,+enchant|US English dictionary|||official|
 jwmconfig2-20111110|jwmconfig2|20111110||Desktop|256K||jwmconfig2-20111110.pet|+jwm2,+gtkdialog3|JWM configuration. note, theme font spec different from shinobars pet. note, designed to work with jwm 500+||||
 jwm_theme_bluevariety-1|jwm_theme_bluevariety|1||Desktop|32K||jwm_theme_bluevariety-1.pet|+jwm2|jwm window manager theme, many shades and gradients of blue||||
-jwm_theme_deepbluebold-1|jwm_theme_deepbluebold|1||Desktop|36K||jwm_theme_deepbluebold-1.pet|+jwm2|Theme for JWM window manager, deep blue, white bold text||||
+jwm_theme_deepbluebold-1-1|jwm_theme_deepbluebold|1-1||Desktop|36K||jwm_theme_deepbluebold-1-1.pet|+jwm2|Theme for JWM window manager, deep blue, white bold text||||
 jwmthememaker-1.5|jwmthememaker|1.5||Desktop|36K||jwmthememaker-1.5.pet||JWM Theme Maker|ubuntu|lucid||
 jwm_theme_stark-1|jwm_theme_stark|1||Desktop|36K||jwm_theme_stark-1.pet|+jwm2|stark black-white with bits of colour theme for jwm window manager||||
 langpack_de-20120403|langpack_de|20120403||Setup|5457K||langpack_de-20120403.pet||German language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 28, 2012||||
 langpack_es-20120328|langpack_es|20120328||Setup|8988K||langpack_es-20120328.pet||es language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 28, 2012||||
 langpack_fr-20120330|langpack_fr|20120330||Setup|7596K||langpack_fr-20120330.pet||French language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 27, 2012. Created by esmourguit||||