Check-in [8ecbca0fdd]
Not logged in

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

Overview

SHA1 Hash:8ecbca0fdd18ec916ee83b0146074a1ce97decc5
Date: 2012-05-16 19:34:12
User: BarryK
Comment:automounting of drives when plug in: fix syntax error in script drive_all

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/usr/local/bin/drive_all

@@ -31,10 +31,11 @@
 #110721 detect if have clicked on a close-box of mounted partition.
 #120110 running as fido, popup password box changes mouse pointer position, need read before run sudo.
 #120129 karl godt: fix ZOMBIES, see http://murga-linux.com/puppy/viewtopic.php?t=71767&start=420. see also rc.shutdown, pmount, pup_event_frontend_d.
 #120323 partial replace 'xmessage' with 'pupmessage'.
 #120516 pup_event_frontend_d may call here when a drive plugged in, fix handling of automounting.
+#120517 syntax error in 120516, quotes needed.
 
 [ ! -f /tmp/desktop_drives_curpos ] && getcurpos > /tmp/desktop_drives_curpos #120110
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
 CURPOS="`cat /tmp/desktop_drives_curpos`" #120110
 rm -f /tmp/desktop_drives_curpos #120110
@@ -362,11 +363,11 @@
 #if dropped down here, it is likely to be a data partition...
 
 #120516 pup_event_frontend_d may call here when a drive plugged in, but only passes one parameter (PARAM1). want FSTYPE also...
 # also, for AUTOTARGET=true in /etc/eventmanager will come here, and a plugged in drive may be more than one partition to automount...
 if [ "$FSTYPE" != "" ];then
- DOPARTS=${ONEDRVNAME}|${FSTYPE}
+ DOPARTS="${ONEDRVNAME}|${FSTYPE}" #120517
 else
  #ONEDRVNAME is probably a drive name, ex sda...
  pPTN="/dev/${ONEDRVNAME}" #no space on end!
  DOPARTS="`probepart -m | grep "$pPTN" | cut -f 1,2 -d '|' | cut -f 3 -d '/' | grep -E 'ext2|ext3|ext4|udf|is09660|vfat|reiser|btrfs|ntfs|msdos|minix' | tr '\n' ' '`" #ex: sda1|ext3 sda2|vfat sda3|ext3
 fi

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

@@ -30,10 +30,11 @@
 #120308 ROX-Filer .mo files are not in standard location. workaround when intltool-update fails.
 #120309 binary executables, option to retain po file for later editing (instead of uncompile mo).
 #120313 langpack pet help msg improved.
 #120313 langpack pet: offer to find more po, mo, pot and t12s translations.
 #120316 scoop up more translations. 120317 L18L: add man pages.
+#120216 small mod. to a message.
 
 #***MOMANAGER IS ENGLISH ONLY (NOT GETTEXT'ED)***
 #it is for use by developers/translators with knowledge of english.
 
 PARAM1=""
@@ -90,11 +91,11 @@
 ppPTN="s%${PATHPREFIX}%%"
 
 #download woof, to get latest files... no, too difficult, just put up warning...
 export MM1_DLG="<window title=\"MoManager: welcome\" window_position=\"1\" resizable=\"false\" icon-name=\"${WINICON}\">
  <vbox>
-  <text><label>Welcome, MoManager will help you to create and edit language translations for your country, for many of the applications in Puppy. MoManager only handles shell scripts and some XML data and .desktop menu files, binary compiled executables are not handled.</label></text>
+  <text><label>Welcome, MoManager will help you to create and edit language translations for your country, for many of the applications in Puppy.</label></text>
   <text><label>VERY IMPORTANT: You must be currently running a Puppy built from the latest version of Woof, or very near latest. If your Puppy is even a month old, it is recommended that you check for a later release -- and be sure that it is built from the latest Woof. You can check my blog (bkhome.org/blog) for release announcements, or adventurous developers can even download Woof and build their own Puppy (the online Woof repository at bkhome.org/fossil/woof2.cgi has link to instructions)</label></text>
   <text><label>If you are currently running a very recent Woof-built Puppy, then click the 'OK' button to continue running MoManager:</label></text>
   <hbox>
    <button ok></button>
    <button cancel></button>