help fn changes added bash completions and some refactoring

Author: iandstanley

bash-completions

@@ -1,8 +1,12 @@
-#!/bin/bash
 # BASH COMPLETION SCRIPT FOR STANDARD_UNIX_NOTES  notes(1) notebook(1)
 # Original PASSWORD_STORE version Copyright (C) 2012 - 2014 Jason A. Donenfeld <[email protected]> and
 # Brian Mattern <[email protected]>. All Rights Reserved.
 
+# Installed into 
+# /usr/share/bash-completion/completions/notes
+# /usr/share/bash-completion/completions/notebook
+
+
 _notes_complete_entries () {
     if [ -n "$XDG_DATA_DIR"  -a  -z "$NOTESDIR" ] ; then
             # only use $XDG_DATA_DIR if NOTESDIR not set

makefile

@@ -32,6 +32,8 @@ install_files:
 	@echo do the install stuff
 	sudo install -o root -m 755  notes /usr/local/bin/notes 
 	sudo ln -sf /usr/local/bin/notes /usr/local/bin/notebook
+	sudo install -o root -m 644 bash-completions /usr/share/bash-completion/completions/notes
+	sudo install -o root -m 644 bash-completions /usr/share/bash-completion/completions/notebook
 
 manpages:
 	@echo create the docs files to be installed
@@ -52,6 +54,8 @@ uninstall:
 	-sudo rm -f /usr/share/man/man1/notebook.1.gz
 	-sudo rm -f /usr/local/bin/notes
 	-sudo rm -f /usr/local/bin/notebook
+	-sudo rm -f /usr/share/bash-completion/completions/notes
+	-sudo rm -f /usr/share/bash-completion/completions/notebook
 
 ## make reinstall                Reinstall the application
 reinstall:	uninstall install

pkgs/debian/makefile

@@ -6,6 +6,8 @@ MANPATH=usr/share/man/man1
 PKGMANDIR=$(PKGBUILDDIR)/$(MANPATH)
 PROGROOT=../..
 DEBIAN=$(PKGBUILDDIR)/DEBIAN
+BASHCOMPLETE="usr/share/bash-completion/completions"
+PKGBASHCOMPLETE=$(PKGBUILDDIR)/$(BASHCOMPLETE)
 
 ## make help:                  Show help
 help:
@@ -25,6 +27,7 @@ var:
 	@echo MANPATH = $(MANPATH)
 	@echo PKGMANDIR = $(PKGMANDIR)
 	@echo PROGROOT = $(PROGROOT)
+	@echo PKGBASHCOMPLETE = $(PKGBASHCOMPLETE)
 
 ## make build:                 Build .DEB package
 deb: clean prep build
@@ -39,9 +42,12 @@ prep:  clean
 	mkdir -p $(DEBIAN)
 	mkdir -p $(PKGBINDIR)
 	mkdir -p $(PKGMANDIR)
+	mkdir -p $(PKGBASHCOMPLETE)
 	sudo install -o root -m 755 $(PROGROOT)/notes $(PKGBINDIR)
 	sudo install -o root -m 644 $(PROGROOT)/docs/notes.1 $(PKGMANDIR)
 	sudo install -o root -m 644 $(PROGROOT)/docs/notebook.1 $(PKGMANDIR)
+	sudo install -o root -m 644 $(PROGROOT)/bash-completions $(PKGBASHCOMPLETE)/notes
+	sudo install -o root -m 644 $(PROGROOT)/bash-completions $(PKGBASHCOMPLETE)/notebook
 	install control $(DEBIAN)
 	cd $(PKGBINDIR); ln -sf  notes notebook