===================================================================
RCS file: /cvs/palm/manage_pre/manage_pre,v
retrieving revision 1.2
retrieving revision 1.6
diff -u -r1.2 -r1.6
--- palm/manage_pre/manage_pre	2009/08/12 21:08:23	1.2
+++ palm/manage_pre/manage_pre	2009/09/21 19:00:06	1.6
@@ -1,8 +1,9 @@
 #!/bin/sh
-# $Id: manage_pre,v 1.2 2009/08/12 20:08:23 andrew Exp $
+# $Id: manage_pre,v 1.6 2009/09/21 18:00:06 andrew Exp $
 
-local _pre_label='Pre'
-local _ipod_label='iPod'
+local _pre_id='Palm, Pre, 0316'
+#local _pre_label='Pre'
+#local _ipod_label='iPod'
 local _mount_dir='/mnt/pre'
 local _name=`basename $0`
 local _unison_config='vogonpa'
@@ -28,14 +29,14 @@
 find_pre() {
     local _dev=`dmesg | grep 'Palm, Pre' | tail -1 | cut -d' ' -f 1`
     if [ X"$_dev" == X"" ]; then
-	    echo Pre not found! >&2
-	    exit 1
+        echo Pre not found! >&2
+        exit 1
     fi
 
-    local _label=`disklabel ${_dev} 2>/dev/null | awk '/^label:/ { print $2 }'`
-    if [ X"$_label" != X"$_pre_label" -a X"$_label" != X"$_ipod_label" ]; then
-	    echo "Pre not labeled properly [$_label]" >&2
-	    exit 2
+    local _id=`dmesg | grep "^$_dev at " | tail -1 | sed -e 's/.*<//' -e 's/>.*$//'`
+    if [ X"$_id" != X"$_pre_id" ]; then
+        echo "Pre [$_dev] not correct id [$_id]" >&2
+        exit 2
     fi
 
     echo /dev/${_dev}i
@@ -49,12 +50,12 @@
     local _mounted=`is_mounted $_dev`
     if [ X"" != X"$_mounted" ]; then
         /bin/sync
-        /sbin/umount $_dev && echo Unmounted Pre
+        $SUDO /sbin/umount $_dev && echo Unmounted Pre
     else
         echo Not mounted
     fi
-    /bin/eject  $_dev 2> /dev/null && echo Ejected Pre
-    rmdir $_mount_dir 2> /dev/null
+    $SUDO /bin/eject  $_dev 2> /dev/null && echo Ejected Pre
+    $SUDO rmdir $_mount_dir 2> /dev/null
 }
 
 mount() {
@@ -63,17 +64,18 @@
         echo Already mounted: ${_mounted%% type*}
         return
     fi
-    mkdir -p $_mount_dir
-	chgrp users $_mount_dir
-	chmod g+w   $_mount_dir
-    /sbin/mount $_dev $_mount_dir && echo Mounted Pre on $_mount_dir
+    $SUDO mkdir -p $_mount_dir
+    $SUDO chgrp users $_mount_dir
+    $SUDO chmod g+w   $_mount_dir
+    $SUDO /sbin/mount $_dev $_mount_dir && echo Mounted Pre on $_mount_dir
 }
 
 synchronize() {
     local _mounted=`is_mounted $_dev`
+    local _did_mount=""
     if [ X"" == X"$_mounted" ]; then
-        echo Not mounted
-        return 1
+        mount || exit 255
+        _did_mount=1
     fi
 
     echo Synchronizing Pre
@@ -84,7 +86,11 @@
     #fi
 
     if [ -e /usr/local/bin/unison ]; then
-        /usr/local/bin/unison $_unison_config
+        /usr/local/bin/unison $_unison_config -auto -batch -ui text
+    fi
+
+    if [ ! -z "$_did_mount" ]; then
+        eject
     fi
 }