Check-in [ad96f65775]
Not logged in

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

Overview

SHA1 Hash:ad96f657753d107154b615e57b06b43015470326
Date: 2012-02-20 08:49:09
User: BarryK
Comment:MoManager bug fix

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/etc/rc.d/rc.shutdown

@@ -61,10 +61,11 @@
 #120103 karl godt: error unmounting stray partitions. 120103 karl godt: more tweaks.
 #120129 karl godt: need to rearrange order, refer http://murga-linux.com/puppy/viewtopic.php?t=71767&start=405.
 #120129 karl godt: improved ZOMBIES, see http://www.murga-linux.com/puppy/viewtopic.php?t=73122
 #120130 rodin.s: update for gettext (line 91).
 #120218 changed TEXTDOMAIN=etcrcd___rc.shutdown to TEXTDOMAIN=rc.shutdown (unlikely to be any other file same name in $PATH).
+#120219 zekebaby: unmount network shares, alternate method. 120220 another alternate method.
 
 #110923
 . /usr/bin/gettext.sh # enables use of eval_gettext (several named variables) and ngettext (plurals)
 export TEXTDOMAIN=rc.shutdown
 export OUTPUT_CHARSET=UTF-8
@@ -187,16 +188,23 @@
   TX_BYTES_MONTH=`expr $TX_BYTES_MONTH + $TX_BYTES`
   echo -n "$TX_BYTES_MONTH" > /var/local/sns/tx_bytes_month
  fi
 fi
 
-#111107 ldolse: unmount network shares before taking down the network
-#(see 111106, need to do it sooner, but 111106 will remount read-only if failed to umount here)
-for MOUNTPOINT in `mount | grep '^//' | cut -d  ' ' -f 3 | tr '\n' ' '`
-do
- umount -f $MOUNTPOINT
-done
+##111107 ldolse: unmount network shares before taking down the network
+##(see 111106, need to do it sooner, but 111106 will remount read-only if failed to umount here)
+#for MOUNTPOINT in `mount | grep '^//' | cut -d  ' ' -f 3 | tr '\n' ' '`
+#do
+# umount -f $MOUNTPOINT
+#done
+##120219 hmmm, zekebaby reports above does not work for him. i looked up an ex: mount -t nfs boffo.clowns.org:/home/bozo /mnt/bozo
+##so this is zekebaby's patch: (see http://murga-linux.com/puppy/viewtopic.php?p=605451#605451)
+#for MOUNTPOINT in `mount | grep ':' | cut -d  ' ' -f 3 | tr '\n' ' '`
+#do
+#  umount -f $MOUNTPOINT
+#done
+umount -a -t cifs,smbfs,nfs,sshfs #120220
 
 #v2.16 some packages have a service script that requires stopping...
 for service_script in /etc/init.d/*
 do
   [ -x $service_script ] && $service_script stop

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

@@ -24,18 +24,22 @@
 #111207 improve search for menu icon.
 #111229 /usr/local/petget/removepreview.sh when uninstalling a pkg, may have copied a file from sfs-layer to top, check.
 #120102 install may have overwritten a symlink-to-dir.
 #120107 rerwin: need quotes around some paths in case of space chars. remove '--unlink-first' from tar (was introduced 120102, don't think necessary).
 #120126 noryb009: fix typo.
+#120219 was not properly internationalized (there was no TEXTDOMAIN).
 
 #information from 'labrador', to expand a .pet directly to '/':
 #NAME="a52dec-0.7.4"
 #pet2tgz "${NAME}.pet"
 #tar -C / --transform 's/^\(\.\/\)\?'"$NAME"'//g' -zxf "${NAME}.tar.gz"
 #i found this also works:
 #tar -z -x --strip=1 --directory=/ -f bluefish-1.0.7.tar.gz
 #v424 .pet pkgs may have post-uninstall script, puninstall.sh
+
+export TEXTDOMAIN=petget___installpkg.sh
+export OUTPUT_CHARSET=UTF-8
 
 APPDIR=$(dirname $0)
 [ -f "$APPDIR/i18n_head" ] && source "$APPDIR/i18n_head"
 LANG_USER=$LANG
 export LANG=C

Changes to woof-code/rootfs-skeleton/usr/local/petget/ui_Classic


Changes to woof-code/rootfs-skeleton/usr/local/petget/ui_Ziggy


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

@@ -19,11 +19,12 @@
 #120213 added management of binary executables.
 #120214 generate a langpack PET package.
 #120215 added management of initrd files (initrd_strings SSS domain).
 #120217 small message fixes.
 #120217 support poeditor.
-#120218 LANG=${ORIGLANG} prefix needed various places.
+#120218 LANG=${ORIGLANG} prefix needed various places. 120219 a few more.
+#1202120 need 'head -n1' ex: /usr/local/petget/ui_Classic has export TEXTDOMAIN in two places.
 
 #***MOMANAGER IS ENGLISH ONLY (NOT GETTEXT'ED)***
 #it is for use by developers/translators with knowledge of english.
 
 PARAM1=""
@@ -111,11 +112,11 @@
 #find all matching .mo files...
 YESCNT=0; NOCNT=0; YESMO_XML=""; NOMO_XML=""
 for AGTS in $GETTEXTSCRIPTS
 do
  xAGTS="`echo -n $AGTS | sed -e 's%SPACECHAR% %g'`"
- TEXTDOMAINVALUE="`grep '^export TEXTDOMAIN=' "$xAGTS" | cut -f 2 -d '=' | tr '\t' ' ' | cut -f 1 -d ' '`"
+ TEXTDOMAINVALUE="`grep '^export TEXTDOMAIN=' "$xAGTS" | head -n 1 | cut -f 2 -d '=' | tr '\t' ' ' | cut -f 1 -d ' '`" #1202120 need 'head -n1' ex: /usr/local/petget/ui_Classic has export TEXTDOMAIN in two places.
 
  #want to know if from Woof or a builtin pkg or later-installed pkg...
  BASExAGTS="`basename "$xAGTS"`"
  xPTN=" ${BASExAGTS}$"
  PATHxAGTS="`dirname "$xAGTS"`"
@@ -665,16 +666,16 @@
     #rodin.s: xgettext does not work properly on alsaconf script, use ready-made alsaconf.pot (in Woof).
     cp -f /usr/share/doc/nls/alsaconf/alsaconf.pot ./
    ;;
    *)
     cp -f "$ASCRIPT" ${ANAME}.sh #hack
-    rxvt -e xgettext --no-wrap -o ${ATEXTDOMAIN}.pot ${ANAME}.sh
+    LANG=${ORIGLANG} rxvt -e xgettext --no-wrap -o ${ATEXTDOMAIN}.pot ${ANAME}.sh
    ;;
   esac
   #this syncs textdomain1.po and textdomain.pot, merges to textdomain.po ...
   rm -f ${ATEXTDOMAIN}.po 2>/dev/null
-  rxvt -e intltool-update --dist --gettext-package=${ATEXTDOMAIN} --output-file=${ATEXTDOMAIN}.po ${ATEXTDOMAIN}1
+  LANG=${ORIGLANG} rxvt -e intltool-update --dist --gettext-package=${ATEXTDOMAIN} --output-file=${ATEXTDOMAIN}.po ${ATEXTDOMAIN}1
   sync
   echo '#!/bin/sh
   sleep 3
   yaf-splash -bg yellow -placement top -timeout 9 -text "The .mo file has been converted to an editable .po file. Edit, then Save, then Quit text editor..."
   ' > /tmp/momanager/yafmsg
@@ -685,11 +686,11 @@
   else
    killall geany 2> /dev/null #otherwise geany will return immediately and continue executing this script.
    sleep 0.5
    LANG=${ORIGLANG} defaulttexteditor /tmp/momanager/${ATEXTDOMAIN}.po
   fi
-  rxvt -e msgfmt --check --output-file=/tmp/momanager/${ATEXTDOMAIN}.mo /tmp/momanager/${ATEXTDOMAIN}.po
+  LANG=${ORIGLANG} rxvt -e msgfmt --check --output-file=/tmp/momanager/${ATEXTDOMAIN}.mo /tmp/momanager/${ATEXTDOMAIN}.po
   pupdialog --background yellow --colors --backtitle "MoManager: post-edit mo" --yes-label "OK" --no-label "Cancel" --yesno "The file /tmp/momanager/${ATEXTDOMAIN}.po has been edited and converted to /tmp/momanager/${ATEXTDOMAIN}.mo. If all went well, click the \ZbOK\ZB button to copy it to \Zb${AMOSPEC}\ZB. Note, as a precaution, the old mo file is at /tmp/momanager/${ATEXTDOMAIN}.moOLD." 0 0
   if [ $? -eq 0 ];then
    cp -f /tmp/momanager/${ATEXTDOMAIN}.mo "${AMOSPEC}"
    #output as a tarball that user can email to pkg author...
    mkdir -p /root/MoManager-${ORIGLANG12}-${APKGNAME}/usr/share/locale/${ATRANSLANG}/LC_MESSAGES
@@ -753,19 +754,19 @@
    alsaconf)
     #rodin.s: xgettext does not work properly on alsaconf script, use ready-made alsaconf.pot (in Woof).
     cp -f /usr/share/doc/nls/alsaconf/alsaconf.pot ./
    ;;
    *)
-    rxvt -e xgettext -o ${ATEXTDOMAIN}.pot --no-wrap ${ANAME}.sh
+    LANG=${ORIGLANG} rxvt -e xgettext -o ${ATEXTDOMAIN}.pot --no-wrap ${ANAME}.sh
     aPTN="s%Project-Id-Version: PACKAGE VERSION%Project-Id-Version: ${ANAME} VERSION%"
     bPTN="s%Content-Type: text/plain; charset=CHARSET%Content-Type: text/plain; charset=UTF-8%"
     cPTN="s% PACKAGE package% ${ANAME} package%"
     #dPTN="s%Content-Type: text/plain; charset=ASCII%Content-Type: text/plain; charset=UTF-8%"
     sed -i -e "$aPTN" -e "$bPTN" -e "$cPTN" ${ATEXTDOMAIN}.pot
    ;;
   esac
-  rxvt -e msginit --no-wrap --locale=${ORIGLANG12} --output-file=${ATEXTDOMAIN}.po --input=${ATEXTDOMAIN}.pot
+  LANG=${ORIGLANG} rxvt -e msginit --no-wrap --locale=${ORIGLANG12} --output-file=${ATEXTDOMAIN}.po --input=${ATEXTDOMAIN}.pot
   sync
   echo '#!/bin/sh
   sleep 3
   yaf-splash -bg yellow -placement top -timeout 9 -text "The translation file is now open in a text editor. Edit, then Save, then Quit text editor..."
   ' > /tmp/momanager/yafmsg2
@@ -776,11 +777,11 @@
   else
    killall geany 2> /dev/null #otherwise geany will return immediately and continue executing this script.
    sleep 0.5
    LANG=${ORIGLANG} defaulttexteditor /tmp/momanager/${ATEXTDOMAIN}.po
   fi
-  rxvt -e msgfmt --check --output-file=/tmp/momanager/${ATEXTDOMAIN}.mo /tmp/momanager/${ATEXTDOMAIN}.po
+  LANG=${ORIGLANG} rxvt -e msgfmt --check --output-file=/tmp/momanager/${ATEXTDOMAIN}.mo /tmp/momanager/${ATEXTDOMAIN}.po
   pupdialog --background yellow --colors --backtitle "MoManager: post-edit mo" --yes-label "OK" --no-label "Cancel" --yesno "The file /tmp/momanager/${ATEXTDOMAIN}.po has been edited and converted to /tmp/momanager/${ATEXTDOMAIN}.mo (the former being the editable translation file and the latter being the compiled translation file). If all went well, click the \ZbOK\ZB button to copy it to \Zb${AMOSPEC}\ZB." 0 0
   if [ $? -eq 0 ];then
    cp -f /tmp/momanager/${ATEXTDOMAIN}.mo "${AMOSPEC}"
    #output as a tarball that user can email to pkg author...
    mkdir -p /root/MoManager-${ORIGLANG12}-${APKGNAME}/usr/share/locale/${ATRANSLANG}/LC_MESSAGES
@@ -1225,13 +1226,13 @@
   if [ "$EXIT" = "edit_bin" ];then
    cp -f "$AMOSPEC" /tmp/momanager/${ATEXTDOMAIN}.moOLD
    msgunfmt "$AMOSPEC" > /tmp/momanager/${ATEXTDOMAIN}1.po
    #this syncs textdomain1.po and textdomain.pot, merges to textdomain.po ...
    rm -f ${ATEXTDOMAIN}.po 2>/dev/null
-   rxvt -e intltool-update --dist --gettext-package=${ATEXTDOMAIN} --output-file=${ATEXTDOMAIN}.po ${ATEXTDOMAIN}1
+   LANG=${ORIGLANG} rxvt -e intltool-update --dist --gettext-package=${ATEXTDOMAIN} --output-file=${ATEXTDOMAIN}.po ${ATEXTDOMAIN}1
   else
-   rxvt -e msginit --no-wrap --locale=${ORIGLANG12} --output-file=${ATEXTDOMAIN}.po --input=${ATEXTDOMAIN}.pot
+   LANG=${ORIGLANG} rxvt -e msginit --no-wrap --locale=${ORIGLANG12} --output-file=${ATEXTDOMAIN}.po --input=${ATEXTDOMAIN}.pot
   fi
 
   sync
   echo '#!/bin/sh
   sleep 3
@@ -1244,11 +1245,11 @@
   else
    killall geany 2> /dev/null #otherwise geany will return immediately and continue executing this script.
    sleep 0.5
    LANG=${ORIGLANG} defaulttexteditor /tmp/momanager/${ATEXTDOMAIN}.po
   fi
-  rxvt -e msgfmt --check --output-file=/tmp/momanager/${ATEXTDOMAIN}.mo /tmp/momanager/${ATEXTDOMAIN}.po
+  LANG=${ORIGLANG} rxvt -e msgfmt --check --output-file=/tmp/momanager/${ATEXTDOMAIN}.mo /tmp/momanager/${ATEXTDOMAIN}.po
   pupdialog --background yellow --colors --backtitle "MoManager: post-edit mo" --yes-label "OK" --no-label "Cancel" --yesno "The file /tmp/momanager/${ATEXTDOMAIN}.po has been edited and converted to /tmp/momanager/${ATEXTDOMAIN}.mo. If all went well, click the \ZbOK\ZB button to copy it to \Zb${AMOSPEC}\ZB. Note, as a precaution, the old mo file is at /tmp/momanager/${ATEXTDOMAIN}.moOLD." 0 0
   if [ $? -eq 0 ];then
    cp -f /tmp/momanager/${ATEXTDOMAIN}.mo "${AMOSPEC}"
    #output as a tarball that user can email to pkg author...
    mkdir -p /root/MoManager-${ORIGLANG12}-${APKGNAME}/usr/share/locale/${ATRANSLANG}/LC_MESSAGES

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

@@ -35,11 +35,11 @@
 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||||
 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_ru-20120213|langpack_ru|20120213||Setup|1104K||langpack_ru-20120213.pet||Russian language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 14, 2012||||
+langpack_ru-20120219|langpack_ru|20120219||Setup|4408K||langpack_ru-20120219.pet||Russian language-pack for Puppy Linux, for any Puppy built from Woof later than Feb. 14, 2012||||
 lhp_sys_info-0.6|lhp_sys_info|0.6||System|156K||lhp_sys_info-0.6.pet||Hardware and Video Reporting Tool, created by tazoc||||
 linux_firewall-2.0rc9-puppy2|linux_firewall|2.0rc9-puppy2||Network|132K||linux_firewall-2.0rc9-puppy2.pet||Firewall||||
 linux_firmware_dvb-1.20|linux_firmware_dvb|1.20||BuildingBlock|48K||linux_firmware_dvb-1.20.pet||dvb usb kernel firmware||||
 mplayer_codecs_basic-20071007|mplayer_codecs_basic|20071007||Multimedia|612K||mplayer_codecs_basic-20071007.pet||minimum essential codecs||||
 mscw-1|mscw|1||Setup|36K||mscw-1.pet|+alsa-lib,+gtkdialog3|Multiple Sound Card Wizard||||

Changes to woof-distro/x86/Packages-puppy-common-official

@@ -285,11 +285,11 @@
 pwget-0.2|pwget|0.2||Internet|56K||pwget-0.2.pet|+wget,+gtkdialog3|file downloader frontend for wget||||
 pwsget-0.1|pwsget|0.1||Internet|40K||pwsget-0.1.pet|+gtkdialog3|Pwsget secure file downloader||||
 pzchmview-1.0d-1|pzchmview|1.0d-1||Document|28K||pzchmview-1.0d-1.pet|+chmlib|PZCHMView CHM Viewer||||
 replaceit-1.0.0|replaceit|1.0.0||BuildingBlock|32K||replaceit-1.0.0.pet||text replacement in a file|puppy|4||
 retrovol-0.10-w5|retrovol|0.10-w5||Multimedia|128K||retrovol-0.10-w5.pet|+gtk+,+alsa-lib|Retrovol sound mixer and tray applet|puppy|wary5||
-rox_filer-201012git-patched|rox_filer|201012git-patched||Filesystem|1464K||rox_filer-201012git-patched.pet|+gtk+|ROX-Filer file manager, note compiled in Wary 102 should work all puppies||||
+rox_filer-20111022-patched-w5c|rox_filer|20111022-patched-w5c||Filesystem|1464K||rox_filer-20111022-patched-w5c.pet|+gtk+|ROX-Filer file manager, note compiled in Wary 5.2.2.2 but should work all puppies|puppy|wary5||
 rpl-1.4.1|rpl|1.4.1||BuildingBlock|48K||rpl-1.4.1.pet||cli utility, text replacement in a file|puppy|4||
 rp_pppoe_cli-3.8-patched2-2-p4|rp_pppoe_cli|3.8-patched2-2-p4||Network|448K||rp_pppoe_cli-3.8-patched2-2-p4.pet||roaring penguin pppoe internet connection|puppy|4||
 rxvt-unicode-9.05-1|rxvt-unicode|9.05-1||Utility|||rxvt-unicode-9.05-1.pet||terminal emulator, compatible with rxvt, supports unicode|puppy|4||
 samba_client-3.0.37|samba_client|3.0.37||BuildingBlock|1008K||samba_client-3.0.37.pet||samba client utilities, note, compiled in slackware 13.1 but should work in all puppies||||
 samba_mount_cifs-3.0.37-s131|samba_mount_cifs|3.0.37-s131||BuildingBlock|48K||samba_mount_cifs-3.0.37-s131.pet||mount.cifs and umount.cifs from samba package|slackware|13.1||

Changes to woof-distro/x86/Packages-puppy-wary5-official

@@ -1065,11 +1065,10 @@
 rgb-1.0.1-w5c|rgb|1.0.1-w5c||Personal|52K||rgb-1.0.1-w5c.pet||X.org RGB database and applications|puppy|wary5||
 rgb_DOC-1.0.1-w5c|rgb_DOC|1.0.1-w5c||Personal|24K||rgb_DOC-1.0.1-w5c.pet||X.org RGB database and applications|puppy|wary5||
 rman_DEV-3.2-w5c|rman_DEV|3.2-w5c||BuildingBlock|96K||rman_DEV-3.2-w5c.pet|+rman|A manual page translator to HTML ASCII TkMan DocBook ...|puppy|wary5||
 rman_DOC-3.2-w5c|rman_DOC|3.2-w5c||BuildingBlock|32K||rman_DOC-3.2-w5c.pet||A manual page translator to HTML ASCII TkMan DocBook ...|puppy|wary5||
 rocknet-2005-06-24-w5c|rocknet|2005-06-24-w5c||Network|60K||rocknet-2005-06-24-w5c.pet||Network configuration|puppy|wary5||
-rox_filer-201012git-patched-w5|rox_filer|201012git-patched-w5||Filesystem|1464K||rox_filer-201012git-patched-w5.pet|+gtk+|ROX-Filer file manager, note compiled in Wary 5.2pre|puppy|wary5||
 rpm-4.8.1-patched_mageia1-w5|rpm|4.8.1-patched_mageia1-w5||Utility|1332K||rpm-4.8.1-patched_mageia1-w5.pet|+sqlite3,+db,+xz,+openssl,+nss,+nspr,+popt|redhat package manager, patched for mageia 1|puppy|wary5||
 rpm_DEV-4.8.1-patched_mageia1-w5|rpm_DEV|4.8.1-patched_mageia1-w5||Utility|364K||rpm_DEV-4.8.1-patched_mageia1-w5.pet|+rpm|redhat package manager, patched for mageia 1|puppy|wary5||
 rpm_DOC-4.8.1-patched_mageia1-w5|rpm_DOC|4.8.1-patched_mageia1-w5||Utility|364K||rpm_DOC-4.8.1-patched_mageia1-w5.pet||redhat package manager||||
 rpm_NLS-4.8.1-patched_mageia1-w5|rpm_NLS|4.8.1-patched_mageia1-w5||Utility|1528K||rpm_NLS-4.8.1-patched_mageia1-w5.pet|+rpm|redhat package manager||||
 rsync-3.0.8-w5c|rsync|3.0.8-w5c||BuildingBlock|292K||rsync-3.0.8-w5c.pet||A replacement for rcp that has many more features|puppy|wary5||

Changes to woof-distro/x86/racy/testing/DISTRO_PKGS_SPECS-puppy-wary5

@@ -564,11 +564,11 @@
 yes|replaceit||exe
 yes|retrovol|retrovol|exe
 no|ripoff||exe,dev>null,doc,nls
 yes|rman|rman|exe>dev,dev,doc,nls
 no|rox-clib||exe,dev,doc,nls
-yes|rox_filer|rox_filer|exe
+yes|rox_filer||exe
 no|rox-menu||exe
 no|rox-monitor-applets||exe
 no|roxpanel-pager||exe
 no|rox-panel-quirky||exe
 no|roxpanel-systray||exe

Changes to woof-distro/x86/wary/testing/DISTRO_PKGS_SPECS-puppy-wary5

@@ -564,11 +564,11 @@
 yes|replaceit||exe
 yes|retrovol|retrovol|exe
 no|ripoff||exe,dev>null,doc,nls
 yes|rman|rman|exe>dev,dev,doc,nls
 no|rox-clib||exe,dev,doc,nls
-yes|rox_filer|rox_filer|exe
+yes|rox_filer||exe
 no|rox-menu||exe
 no|rox-monitor-applets||exe
 no|roxpanel-pager||exe
 no|rox-panel-quirky||exe
 no|roxpanel-systray||exe