[Refdb-cvs] CVS: refdb/scripts refdb-backup,1.3.2.2,1.3.2.3 refdb-restore,1.3.2.2,1.3.2.3
Status: Beta
Brought to you by:
mhoenicka
Menu
▾
▴
[Refdb-cvs] CVS: refdb/scripts refdb-backup,1.3.2.2,1.3.2.3 refdb-restore,1.3.2.2,1.3.2.3
|
From: David N. <dav...@us...> - 2005-01-31 15:37:10
|
Update of /cvsroot/refdb/refdb/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32085 Modified Files: Tag: Release_0_9_5_stable refdb-backup refdb-restore Log Message: Bugfix: Corrected getopts error message -- was showing incorrect command line parameters. Index: refdb-backup =================================================================== RCS file: /cvsroot/refdb/refdb/scripts/refdb-backup,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -U2 -r1.3.2.2 -r1.3.2.3 --- refdb-backup 31 Jan 2005 13:53:17 -0000 1.3.2.2 +++ refdb-backup 31 Jan 2005 15:36:58 -0000 1.3.2.3 @@ -21,4 +21,5 @@ refdba="refdba" # refdba command refdbc="refdbc" # refdbc command +parameters="[-u USER] [-w PWD] [-f FORMAT] [-d DIR]" # cmd-line options @@ -64,9 +65,9 @@ echo "Backs up references, notes and styles from RefDB." echo - echo "Usage: `basename $0` [-u USER] [-w PWD] [-f FORMAT] [-d DIR]" + echo "Usage: `basename $0` ${parameters}" echo " `basename $0` [ -h ]" echo echo "Options: -u USER = username for RefDB clients ('refdba'|'refdbc')" - echo " w PWD = password for RefDB clients ('refdba'|'refdbc')" + echo " -w PWD = password for RefDB clients ('refdba'|'refdbc')" echo " -f FORMAT = references storage format ('ris'|'risx')" echo " default is 'ris'" @@ -95,10 +96,10 @@ refdbc="${refdbc} -w \"${OPTARG}\"";; \? ) echo "Error: Invalid flag '${OPTARG}' detected" - echo "Usage: `basename $0` [ -f FORMAT ] [ -d DIR ]" + echo "Usage: `basename $0` ${parameters}" echo "Try '`basename $0` -h' for help" echo -ne "\a" exit 1;; \: ) echo "Error: No argument supplied for flag '${OPTARG}'" - echo "Usage: `basename $0` [ -f FORMAT ] [ -d DIR ]" + echo "Usage: `basename $0` ${parameters}" echo "Try '`basename $0` -h' for help" echo -ne "\a" Index: refdb-restore =================================================================== RCS file: /cvsroot/refdb/refdb/scripts/refdb-restore,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -U2 -r1.3.2.2 -r1.3.2.3 --- refdb-restore 31 Jan 2005 13:53:17 -0000 1.3.2.2 +++ refdb-restore 31 Jan 2005 15:36:58 -0000 1.3.2.3 @@ -20,5 +20,5 @@ refdbc="refdbc" # refdbc command archive=$1 # name of backup archive - +parameters="[-u USER] [-w PWD] <backup_archive>" # cmd-line options # PROCEDURES @@ -60,10 +60,10 @@ echo "Restores references, notes and styles from backup archive." echo - echo "Usage: `basename $0` [-u USER] [-w PWD] <backup_archive>" + echo "Usage: `basename $0` ${parameters}" echo echo "Must be archive created by 'refdb-backup' utility." echo echo "Options: -u USER = username for RefDB clients ('refdba'|'refdbc')" - echo " w PWD = password for RefDB clients ('refdba'|'refdbc')" + echo " -w PWD = password for RefDB clients ('refdba'|'refdbc')" echo "Note: RefDB clients can be configured for automatic access." echo " If this is so, username and password are not required." @@ -111,10 +111,10 @@ refdbc="${refdbc} -w \"${OPTARG}\"";; \? ) echo "Error: Invalid flag '${OPTARG}' detected" - echo "Usage: `basename $0` [ -f FORMAT ] [ -d DIR ]" + echo "Usage: `basename $0` ${parameters}" echo "Try '`basename $0` -h' for help" echo -ne "\a" exit 1;; \: ) echo "Error: No argument supplied for flag '${OPTARG}'" - echo "Usage: `basename $0` [ -f FORMAT ] [ -d DIR ]" + echo "Usage: `basename $0` ${parameters}" echo "Try '`basename $0` -h' for help" echo -ne "\a" @@ -146,5 +146,5 @@ # - ensure deletion on exit and change to working directory tempdir=`mktemp -dq` \ - || endScript "Error: Unable to create temporary directory." "failed" + || endScript "Error: Unable to create temporary directory." "failed" trap "rm -fr ${tempdir}" 0 1 2 3 5 15 # no need to worry about deleting later cd ${tempdir} || \ @@ -178,8 +178,4 @@ refdbc -C addref -d ${db} -t ${format} ${reffile} &> /dev/null report $? -# # - delete file -# echo -n " Deleting temporary file ... " -# rm -f ${reffile} -# report $? # restore notes notefile="db_${db}/${notes_backup}" @@ -193,12 +189,4 @@ refdbc -C addnote -d ${db} ${notefile} &> /dev/null report $? -# # - delete file -# echo -n " Deleting temporary file ... " -# rm -f ${notefile} -# report $? -# # delete database directory -# echo -n " Deleting temporary db directory ... " -# rmdir db_${db} -# report $? fi done @@ -220,7 +208,4 @@ refdba -C addstyle ${stylefile} &> /dev/null report $? -# echo -n " Deleting temporary file ... " -# rm -f ${stylefile} -# report $? else report 1 |
