Skip to content

Commit 87433b7

Browse files
committed
fixed 'notes use' with no arguement ... odd deferencing to rectify later ... works for no
1 parent 0421ace commit 87433b7

File tree

1 file changed

+13
-26
lines changed

1 file changed

+13
-26
lines changed

notes

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
VERSION=0.1
1111
#NOTES_UMASK='077'
1212
NOTESDIR="${HOME}/.notes"
13-
DEFAULT_NOTEBOOK="${NOTESDIR}/notes"
13+
INITIAL_NOTEBOOK="${NOTESDIR}/notes"
1414
DEFAULT_POINTER="${NOTESDIR}/DEFAULT"
1515
USE_POINTER="${NOTESDIR}/USE"
1616
GPGKEY=''
@@ -32,16 +32,16 @@ cmd_init (){ # setup directories and GPG key to be used
3232

3333
create_config
3434

35-
echo making default notebook \'${DEFAULT_NOTEBOOK}\'
36-
if [ ! -d "$DEFAULT_NOTEBOOK" ]; then
37-
mkdir $DEFAULT_NOTEBOOK
38-
echo Your default notebook $DEFAULT_NOTEBOOK has been created you may now create notes
39-
# point to DEFAULT_NOTEBOOK with DEFAULT_POINTER and USE_POINTER
35+
echo making default notebook \'${INITIAL_NOTEBOOK}\'
36+
if [ ! -d "$INITIAL_NOTEBOOK" ]; then
37+
mkdir $INITIAL_NOTEBOOK
38+
echo Your default notebook $INITIAL_NOTEBOOK has been created you may now create notes
39+
# point to INITIAL_NOTEBOOK with DEFAULT_POINTER and USE_POINTER
4040
if [ ! -f "$DEFAULT_POINTER" ] ; then
41-
ln -s $DEFAULT_NOTEBOOK $DEFAULT_POINTER
41+
ln -s $INITIAL_NOTEBOOK $DEFAULT_POINTER
4242
fi
4343
if [ ! -f "$USE_POINTER" ] ; then
44-
ln -s $DEFAULT_NOTEBOOK $USE_POINTER
44+
ln -s $INITIAL_NOTEBOOK $USE_POINTER
4545
fi
4646
fi
4747
}
@@ -404,27 +404,14 @@ cmd_default () {
404404
cmd_use () {
405405
nb="$@"
406406
notebook="$NOTESDIR/$nb"
407-
echo nb = $nb
408-
echo notebook = $notebook
409-
echo use pointer = $USE_POINTER
410-
echo default pointer = $DEFAULT_POINTER
411-
defaultnbval="`readlink -f $DEFAULT_POINTER`"
412-
defaultnb="`basename $DEFAULT_POINTER`"
413-
echo default notebookval = $defaultnbval
414-
echo default notebook = $defaultnb
415-
echo ln -sf "$NOTESDIR/`basename $defaultnbval`" "$USE_POINTER"
416-
#echo ln -sf "$USE_POINTER" "$NOTESDIR/`basename $defaultnb`"
417-
echo ln -sf "$nb" "$USE_POINTER"
418407

419408
if [ "$nb" = "" ] ;then
409+
defaultnbval="`readlink -f $DEFAULT_POINTER`"
410+
defaultnb="`basename $DEFAULT_POINTER`"
420411
echo no notebook specified use default
421-
unlink "$USE_POINTER"
422-
ln -s "$defaultnb" "$USE_POINTER"
423-
#ln -sf "$USE_POINTER" "$defaultnbval"
424-
#echo ln -sf "$NOTESDIR/`basename $defaultnbval`" "$USE_POINTER"
425-
#ln -sf "$NOTESDIR/`basename $defaultnb`" "$USE_POINTER"
426-
#ln -sf "$USE_POINTER" "$NOTESDIR/`basename $defaultnb`"
427-
# ln -sf "`readlink -f $DEFAULT_POINTER`" "$USE_POINTER"
412+
unlink "$USE_POINTER"
413+
ln -s "`basename $defaultnbval`" "$USE_POINTER"
414+
#ln -s "`$defaultnbval`" "$USE_POINTER"
428415
exit 0
429416
fi
430417
if [ -d "$notebook" ] ; then

0 commit comments

Comments
 (0)