Change /mnt/psion to /mnt/epoc.

Change "Psion" to "EPOC" and similar in psidump.

Remove useless cross-reference section from psidump.1.

3 files changed, 43 insertions, 48 deletions

diff --git a/etc/plptools.in b/etc/plptools.in
index d19378c..e0a1084 100755
--- a/etc/plptools.in
+++ b/etc/plptools.in
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# psion        Starts ncpd/plpfuse.
+# plptools        Starts ncpd/plpfuse.
 #
 # chkconfig: 2345 45 10
-# description: This facility enables connectivity to a Psion series 5.
+# description: This facility enables connectivity to an EPOC PDA.
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -11,11 +11,11 @@
 [ -f @prefix@/sbin/ncpd ] || exit 0
 [ -f @prefix@/sbin/plpfuse ] || exit 0
 [ -f @prefix@/sbin/plpprintd ] || exit 0
-[ -f /etc/sysconfig/psion ] || exit 0
-. /etc/sysconfig/psion
+[ -f /etc/sysconfig/plptools ] || exit 0
+. /etc/sysconfig/plptools
 
 start() {
-	echo "Starting Psion support ..."
+	echo "Starting EPOC support ..."
 	RETVAL=0
 	if test "$START_NCPD" = "yes" ; then
 		echo -n "  ncpd: "
@@ -39,12 +39,12 @@ start() {
 			echo
 		fi
 	fi
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/psion
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/plptools
 	return $RETVAL
 }
 
 stop() {
-	echo "Stopping Psion support ..."
+	echo "Stopping EPOC support ..."
 	RETVAL=0
 	if test "$START_PLPPRINTD" = "yes" ; then
 		echo -n "  plpprintd: "
@@ -53,7 +53,7 @@ stop() {
 	fi
 	if test "$START_PLPFUSE" = "yes" ; then
 		echo -n "  plpfuse: "
-		fusermount -u /mnt/psion
+		fusermount -u /mnt/epoc
 		echo
 	fi
 	if test "$START_NCPD" = "yes" ; then
@@ -62,7 +62,7 @@ stop() {
 		RETVAL=$?
 		echo
 	fi
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/psion
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/plptools
 	return $RETVAL
 }
 
@@ -87,10 +87,10 @@ case "$1" in
   	restart
 	;;
   condrestart)
-  	test -f /var/lock/subsys/psion && restart || :
+  	test -f /var/lock/subsys/plptools && restart || :
 	;;
   *)
-	echo "Usage: psion {start|stop|status|restart|reload|condrestart}"
+	echo "Usage: plptools {start|stop|status|restart|reload|condrestart}"
 	exit 1
 esac
 
diff --git a/etc/psidump b/etc/psidump
index db6f5d7..b0866ca 100644
--- a/etc/psidump
+++ b/etc/psidump
@@ -1,5 +1,5 @@
 #!/bin/bash
-# psidump - backup psion files
+# psidump - backup EPOC files
 # Copyright (C) 2001  Alain Trembleau <alain@platodesigns.com>
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -42,11 +42,11 @@ function usage () {
     echo "Usage : psidump [-fivV] [-D <disk>] [-m <mount_dir>] [-d <dump_dir>]"
     if [[ $detail ]]; then
         echo "Options:"
-        echo " d <dir>  unix dump directory"
-        echo " D <disk> psion disks to be backed up"
+        echo " d <dir>  Unix dump directory"
+        echo " D <disk> EPOC disks to be backed up"
         echo " f        forces a full backup"
         echo " i        perform an incremental backup"
-        echo " m <dir>  psion mount point"
+        echo " m <dir>  EPOC mount point"
         echo " v        verbose output"
         echo " V        display the version and exit"
     fi
@@ -79,9 +79,9 @@ function create_dirs () {
         mkdir  "$localdir"/backups/tarfiles
     fi
 
-    if [[ ! -f "$localdir"/etc/psitab ]] ; then
-        cat >  "$localdir"/etc/psitab << END1
-# psitab
+    if [[ ! -f "$localdir"/etc/epoctab ]] ; then
+        cat >  "$localdir"/etc/epoctab << END1
+# epoctab
 #
 # This file is a table of the different EPOC machines which have connected
 # to this machine.  The first entry is the machine id, and the second
@@ -173,7 +173,7 @@ function dump_drive () {
     fi
 
     tar -c -g "$localdir"/etc/dumpinfo."$machine_name"."$drive_name" -v -z \
-      -f "$localdir"/backups/tarfiles/psion."$machine_name"."$drive_name".$timestamp.tgz \
+      -f "$localdir"/backups/tarfiles/epoc."$machine_name"."$drive_name".$timestamp.tgz \
       -C "$psidir"/$drive \
       .
 #      . \
@@ -207,15 +207,15 @@ function restore_drive () {
     # Now restore the files to an appropriate location.
     tar -x -g $localdir/etc/dumpinfo."$machine_name"."$drive_name" -v -z \
       -C $localdir/backups/"$machine_name"/"$drive_name" \
-      -f $localdir/backups/tarfiles/psion."$machine_name"."$drive_name".$timestamp.tgz
+      -f $localdir/backups/tarfiles/epoc."$machine_name"."$drive_name".$timestamp.tgz
 #      | tee -a "$localdir"/etc/dumplog
 }
 
 ## Main Program
 
 # Default settings
-psidir="/mnt/psion"
-localdir="$HOME/psion"
+psidir="/mnt/epoc"
+localdir="$HOME/epoc"
 dump_drive_list="CDE"
 full_backup=0
 verbose=0
@@ -238,7 +238,7 @@ while getopts ":d:D:fim:vV" option; do
         full_backup=0
         ;;
 
-    m)  # Set the mount point where the psion files are to be found
+    m)  # Set the mount point where the EPOC files are to be found
         psidir=$OPTARG
         ;;
 
@@ -266,7 +266,7 @@ fi
 # Check whether all the appropriate directories and files exist
 create_dirs "$localdir"
 
-# Determine which psion
+# Determine which EPOC device
 machine_id=`
   plpftp machinfo |
   awk -F: '$1=="  Machine UID" { print $2 }' |
@@ -274,21 +274,21 @@ machine_id=`
 `
 
 machine_name=`
-  grep -v "^#" $HOME/psion/etc/psitab |
+  grep -v "^#" $HOME/epoc/etc/epoctab |
   awk -F"\t" '$1=="'$machine_id'" {print $2}'
 `
 
 # Deal with the possibility of no name entry
 if [[ -z $machine_name ]] ; then
-    echo "This is the first time this Psion has been backed up"
+    echo "This is the first time this device has been backed up"
     echo "on this machine."
     echo "Please enter a machine name - eg: My Psion"
     read -p "Machine name: " machine_name
 
     # Should have a check to make sure this name hasn't already been used.
 
-    echo "#"                           >> $localdir/etc/psitab
-    echo "$machine_id	$machine_name" >> $localdir/etc/psitab
+    echo "#"                           >> $localdir/etc/epoctab
+    echo "$machine_id	$machine_name" >> $localdir/etc/epoctab
 fi
 
 if [[ ! -d "$localdir"/backups/"$machine_name" ]] ; then
diff --git a/etc/psidump.1 b/etc/psidump.1
index 82d5401..5b9713d 100644
--- a/etc/psidump.1
+++ b/etc/psidump.1
@@ -18,7 +18,7 @@ psidump \- This is an example of a sample man page
 
 .SH DESCRIPTION
 .I psidump
-is a command to back up files from a psion or EPOC machine to your linux box.
+is a command to back up files from an EPOC device to your PC.
 By default, it will only backup those files that have changed since it
 was last backed up.
 
@@ -42,52 +42,47 @@ Performs an incremental back up - only backs up the files that have
 changed since the last backup.  This is the default.
 .TP
 .BI "\-D " disk(s)
-Specify the psion disks to be backed up.  This defaults to the 'C' and
+Specify the EPOC disks to be backed up.  This defaults to the 'C' and
 'D' drives.  For reasons of completeness, the 'Z' (ROM drive) can also
 be specified for backup (but there probably isn't any need to - unless
-you plan to do unspeakable things to the insides of you psion!!).
+you plan to do unspeakable things to the insides of your PDA!).
 .TP
 .BI "\-m " mount_dir
 Specify the mount directory.  This defaults to the directory specified
-is your psion configuration - usually /mnt/psion.
+is your plptools configuration - usually /mnt/epoc.
 .TP
 .BI "\-d " dump_dir
-Specify the dump directory.  This defaults to $HOME/psion/backups.
+Specify the dump directory.  This defaults to $HOME/epoc/backups.
 
 .SH ENVIRONMENT
 .TP
-$HOME/psion
-Default directory where psion psion configuration and dump information
+$HOME/epoc
+Default directory where configuration and dump information
 is stored.
 .TP
-$HOME/psion/etc
-Configuration information about your psion(s) is stored here.
+$HOME/epoc/etc
+Configuration information about your PDA(s) is stored here.
 .TP
-$HOME/psion/backups
+$HOME/epoc/backups
 All backups are stored under this directory.
 
 .SH FILES
-All files that are used are located in $HOME/psion.  The directories
+All files that are used are located in $HOME/epoc.  The directories
 are:
 .TP
-$HOME/psion/etc/psitab
+$HOME/epoc/etc/plptab
 This file is a table of the different EPOC machines which have connected
 to this machine.  The first entry is the machine id, and the second
 entry is the machine name.
 Note that there must be a <tab> between the two fields!                                           
-Any lins starting with a '#' are comments.
+Any lines starting with a '#' are comments.
 .TP
-$HOME/psion/backups
+$HOME/epoc/backups
 Executable files
 .TP
-$HOME/psion/man
+$HOME/epoc/man
 Man pages
 
-.SH SEE ALSO
-.BR man (1),
-.BR groff (1),
-.BR groff_man (7)
-
 .SH AUTHOR
 Alain Trembleau <alain@platodesigns.com>