Check-in [d14df7b262]
Not logged in

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

Overview

SHA1 Hash:d14df7b26236171c823567ed3ed2b5691b65a311
Date: 2012-08-30 14:18:15
User: BarryK
Comment:fix run of welcome1stboot in delayedrun, add minixcal for precise, fix spellcheck for mozilla-based browsers. ref blog 02977

Tags And Properties
Changes

Changes to woof-code/3builddistro

@@ -129,10 +129,11 @@
 #120714 revert 120708. instead, BOOT_BOARD (= raspi, mele, odroidx, etc.) read by quicksetup.
 #120720 raspbian wheezy has files in /lib/arm-linux-gnueabihf and /usr/lib/arm-linux-gnueabihf
 #120721 support ubuntu and debian arm multiarch.
 #120723 BOOT_DISABLEXORGWIZARD variable.
 #120724 'alsaconf' does not work on arm boards, BOOT_DISABLEALSACONF variable. refer /usr/sbin/alsawizard.
+#120830 my hunspell-en-us pet has pinstall.sh that creates symlinks of en_US.aff and en_US.dic from seamonkey and firefox. however, need to do this thoroughly.
 
 #v431 accepts passed params, from woof_gui_tabs:
 #$1=$CHOICE_KERNELPKG $2=$CHOICE_SCSI $3=$CHOICE_BIGMODEM $4=$CHK_FB_STATE $5=$CHK_EXOTIC_STATE $6=$CHK_RADICAL_STATE
 #100912 add $7=CHK_SIMPLE_FILENAMES
 
@@ -2513,12 +2514,24 @@
  if [ -e rootfs-complete/usr/share/misc/usb.ids ];then
   ln -s misc/usb.ids rootfs-complete/usr/share/usb.ids
  fi
 fi
 
-
-
+#120830 my hunspell-en-us pet has pinstall.sh that creates symlinks of en_US.aff and en_US.dic
+#from seamonkey and firefox. however, need to do this thoroughly...
+#note: see also woof rootfs-skeleton/usr/share/doc/langpack-template (used by momanager).
+if [ -d rootfs-complete/usr/share/hunspell ];then
+ for ONEHUN in `find rootfs-complete/usr/share/hunspell -mindepth 1 -maxdepth 1 -type f -name '*.dic' -o -name '*.aff' | tr '\n' ' '`
+ do
+  HUNBASE="`basename $ONEHUN`"
+  DICTDIRS="`find rootfs-complete/usr/lib -mindepth 2 -maxdepth 2 -type d -name dictionaries | tr '\n' ' '`"
+  for ONEDICTDIR in $DICTDIRS
+  do
+   [ ! -e ${ONEDICTDIR}/${HUNBASE} ] && ln -s ../../../share/hunspell/${HUNBASE} ${ONEDICTDIR}/${HUNBASE}
+  done
+ done
+fi
 
 
 ###########
 #build the rootfs-complete sfs...
 echo

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

@@ -48,10 +48,11 @@
 #120708 run 'quickarm' instead of 'quicksetup' on arm boards. see 3builddistro, /usr/sbin/quicksetup.
 #120714 revert 120708.
 #120718 modify initial sleep.
 #120823 rerwin: skip quicksetup if /etc/personal_settings_popup_disabled file created by remasterpup2 (modified by rerwin).
 #120823 rerwin: use distro-specific delayedrun if available.
+#120830 quicksetup restarts X, welcome1stboot did not run.
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #120110
 
 export TEXTDOMAIN=delayedrun
 export OUTPUT_CHARSET=UTF-8
@@ -134,16 +135,18 @@
 #offer to popup a getting-started html page...
 #120620 change logic so get these when first boot full install...
 #the test for /etc/videomode is for when Xvesa has finished choosing a resolution...
 if [ "`readlink /usr/bin/X`" = "Xorg" -o -e /etc/videomode ];then #w007
  if [ ! -f /var/local/delayedrun_firstboot_flag ];then
-  touch /var/local/delayedrun_firstboot_flag
-  if [ "$DISTRO_XORG_AUTO" = "yes" ];then #see /etc/DISTRO_SPECS 111019
-   #quick setup window for country and language and X resolution...
-   QUICKSETUP="quicksetup"
-   [ "`readlink /usr/bin/X | grep 'Xorg'`" = "" ] && QUICKSETUP="quickcountry" #probably Xvesa, offer country settings only.
-   [ ! -f /etc/personal_settings_popup_disabled ] && ${QUICKSETUP} #120823 rerwin: skip quicksetup if /etc/personal_settings_popup_disabled file created by remasterpup2 (modified by rerwin).
+  if [ ! -f /tmp/delayedrun_firstboot_flag ];then #120830 if quicksetup restarts X, reenter here jumps this...
+   touch /tmp/delayedrun_firstboot_flag
+   if [ "$DISTRO_XORG_AUTO" = "yes" ];then #see /etc/DISTRO_SPECS 111019
+    #quick setup window for country and language and X resolution...
+    QUICKSETUP="quicksetup"
+    [ "`readlink /usr/bin/X | grep 'Xorg'`" = "" ] && QUICKSETUP="quickcountry" #probably Xvesa, offer country settings only.
+    [ ! -f /etc/personal_settings_popup_disabled ] && ${QUICKSETUP} #120823 rerwin: skip quicksetup if /etc/personal_settings_popup_disabled file created by remasterpup2 (modified by rerwin).
+   fi
   fi
   if [ -c /dev/mixer ];then #110113 test for sound ready, see /etc/init.d/10alsa.
    aplay /usr/share/audio/2barks.au &
    #wavplay /usr/share/audio/2barks.wav &
    RETAPLAY=$?
@@ -151,10 +154,11 @@
   fi
   welcome1stboot & #110412 now in /usr/sbin
   sleep 3 #101009
   #[ $RETAPLAY -eq 0 ] && kill $PIDAPLAY 2> /dev/null
   #[ "`pidof aplay`" != "" ] && killall aplay
+  touch /var/local/delayedrun_firstboot_flag
  fi
 fi
 
 #v2.16 popup the BootManager if an extra SFS file added (once only)...
 if [ ! $PUPMODE -eq 5 ];then

Changes to woof-code/rootfs-skeleton/usr/share/doc/langpack-template/pinstall.sh

@@ -1,10 +1,11 @@
 #!/bin/sh
 #Barry Kauler, Feb. 2012. GPL3 (/usr/share/doc/legal)
 #this is the post-install script for a langpack PET created by /usr/sbin/momanager.
 #MoManager will replace the strings TARGETLANG and POSTINSTALLMSG.
 #120315 maybe have hunspell dictionaries in langpack.
+#120830 improved symlinks to hunspell dictionaries.
 
 echo "Post install script for TARGETLANG language pack"
 
 #if [ "$LANG" = "C" ];then #in case caller script did this.
  LANG="`grep '^LANG=' /etc/profile | cut -f 2 -d '=' | cut -f 1 -d ' '`"
@@ -45,17 +46,30 @@
   fi
  done
  rm -r -f usr/share/desktop-directories.in
 fi
 
+#120830 improved...
 #120315 maybe have hunspell dictionaries in langpack (see also momanager)...
-for ONEHUN in `find ./usr/share/hunspell -mindepth 1 -maxdepth 1 -type f -name '*.dic' -o -name '*.aff' | tr '\n' ' '`
-do
- HUNBASE="`basename $ONEHUN`"
- [ -e ./usr/lib/seamonkey ] && ln -snf ../../../share/hunspell/${HUNBASE} ./usr/lib/seamonkey/dictionaries/${HUNBASE}
- [ -e ./usr/lib/firefox ] && ln -snf ../../../share/hunspell/${HUNBASE} ./usr/lib/firefox/dictionaries/${HUNBASE}
-done
+#note: same code also in woof 3builddistro.
+#for ONEHUN in `find ./usr/share/hunspell -mindepth 1 -maxdepth 1 -type f -name '*.dic' -o -name '*.aff' | tr '\n' ' '`
+#do
+# HUNBASE="`basename $ONEHUN`"
+# [ -e ./usr/lib/seamonkey ] && ln -snf ../../../share/hunspell/${HUNBASE} ./usr/lib/seamonkey/dictionaries/${HUNBASE}
+# [ -e ./usr/lib/firefox ] && ln -snf ../../../share/hunspell/${HUNBASE} ./usr/lib/firefox/dictionaries/${HUNBASE}
+#done
+if [ -d ./usr/share/hunspell ];then
+ for ONEHUN in `find ./usr/share/hunspell -mindepth 1 -maxdepth 1 -type f -name '*.dic' -o -name '*.aff' | tr '\n' ' '`
+ do
+  HUNBASE="`basename $ONEHUN`"
+  DICTDIRS="`find ./usr/lib -mindepth 2 -maxdepth 2 -type d -name dictionaries | tr '\n' ' '`"
+  for ONEDICTDIR in $DICTDIRS
+  do
+   [ ! -e ${ONEDICTDIR}/${HUNBASE} ] && ln -s ../../../share/hunspell/${HUNBASE} ${ONEDICTDIR}/${HUNBASE}
+  done
+ done
+fi
 
 
 if [ "`pwd`" = "/" ];then #installing PET in a running puppy.
  if [ "$LANG1" != "en" ];then
   #need to update SSS translations...

Changes to woof-distro/x86/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -286,11 +286,12 @@
 yes|hicolor-icon-theme|hicolor-icon-theme|exe,dev>null,doc,nls
 no|homebank|homebank,homebank-data|exe,dev>null,doc,nls
 yes|homebank||exe,dev,doc,nls| #my own pet with less dependencies.
 yes|hotplug2stdout||exe
 yes|htop||exe
-yes|hunspell|hunspell,libhunspell-1.3-0,libhunspell-dev,hunspell-en-us|exe,dev,doc,nls
+yes|hunspell|hunspell,libhunspell-1.3-0,libhunspell-dev|exe,dev,doc,nls
+yes|hunspell-en-us|hunspell-en-us|exe,dev,doc,nls
 no|icons_puppy_app16||exe| #large collection of 16x16 app icons.
 yes|id3lib|libid3-3.8.3c2a,libid3-3.8.3-dev|exe,dev,doc,nls
 yes|ifplugd||exe
 yes|ifplugd_old||exe
 yes|ijs|libijs-0.35,libijs-dev|exe,dev,doc,nls
@@ -459,11 +460,11 @@
 yes|metamail||exe
 yes|mhash|libmhash2,libmhash-dev|exe,dev,doc,nls
 yes|mhwaveedit||exe
 no|midori|midori,libgstreamer0.10-0,libgstreamer-plugins-base0.10-0,libicu42,libsqlite3-0,libunique-1.0-0,libwebkit-1.0-2|exe,dev,nls,doc
 yes|mingetty||exe,dev,doc,nls
-no|minixcal||exe
+yes|minixcal||exe,dev,doc,nls
 yes|mirdir||exe
 no|mktemp|mktemp|exe,dev>null,doc,nls
 yes|mktemp||exe
 yes|modem_stats||exe
 yes|module-init-tools|module-init-tools|exe,dev,doc,nls

Changes to woof-distro/x86/ubuntu/precise/DISTRO_SPECS

@@ -1,9 +1,9 @@
 #One or more words that identify this distribution:
 DISTRO_NAME='Precise Puppy'
 #version number of this distribution:
-DISTRO_VERSION=5.2.71
+DISTRO_VERSION=5.2.72
 #The distro whose binary packages were used to build this distribution:
 DISTRO_BINARY_COMPAT='ubuntu'
 #Prefix for some filenames: exs: precisesave.2fs, precise-4.99.0.sfs
 DISTRO_FILE_PREFIX='precise'
 #The version of the distro whose binary packages were used to build this distro: