FHS compliance (closes #18)

19 files changed, 22 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index 374579c..7d734ff 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,8 @@ clean:
 
 install_lib:
 	$(INSTALL) -D --mode=0755 lib/keyringer/functions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/functions
-
-install_share:
-	$(INSTALL) -D --mode=0755 -d share/keyringer $(DESTDIR)/$(PREFIX)/share/$(PACKAGE)
-	$(INSTALL) -D --mode=0755 share/keyringer/* $(DESTDIR)/$(PREFIX)/share/$(PACKAGE)
+	$(INSTALL) -D --mode=0755 -d lib/keyringer/actions $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
+	$(INSTALL) -D --mode=0755 lib/keyringer/actions/* $(DESTDIR)/$(PREFIX)/lib/$(PACKAGE)/actions
 
 install_bin:
 	$(INSTALL) -D --mode=0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer
@@ -44,7 +42,7 @@ install_completion:
 	$(INSTALL) -D --mode=0644 lib/keyringer/completions/zsh/_keyringer $(DESTDIR)/$(PREFIX)/share/zsh/vendor-completions/_keyringer
 
 install: clean
-	@make install_lib install_share install_bin install_doc install_man install_completion
+	@make install_lib install_bin install_doc install_man install_completion
 
 build_man:
 	pandoc -s -w man share/man/keyringer.1.mdwn -o share/man/keyringer.1
diff --git a/keyringer b/keyringer
index a4e8b2c..604ef1d 100755
--- a/keyringer
+++ b/keyringer
@@ -137,9 +137,9 @@ else
 fi
 
 # Set actions location
-if [ -e "`dirname $(readlink -f $0)`/share/$NAME" ]; then
+if [ -e "`dirname $(readlink -f $0)`/lib/$NAME/actions" ]; then
   # Development or local installation layout
-  ACTIONS="`dirname $(readlink -f $0)`/share/$NAME"
+  ACTIONS="`dirname $(readlink -f $0)`/lib/$NAME/actions"
 else
   # System installation layout
   ACTIONS="`dirname $(readlink -f $0)`/../share/$NAME"
diff --git a/share/keyringer/append b/lib/keyringer/actions/append
index bcc9e5e..30c2d5b 100755
--- a/share/keyringer/append
+++ b/lib/keyringer/actions/append
@@ -4,7 +4,7 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer/functions"
+LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 # Get file
diff --git a/share/keyringer/append-batch b/lib/keyringer/actions/append-batch
index 6b140f7..6b140f7 120000
--- a/share/keyringer/append-batch
+++ b/lib/keyringer/actions/append-batch
diff --git a/share/keyringer/commands b/lib/keyringer/actions/commands
index 139725a..2605666 100755
--- a/share/keyringer/commands
+++ b/lib/keyringer/actions/commands
@@ -4,7 +4,7 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer/functions"
+LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 keyringer_show_actions
diff --git a/share/keyringer/decrypt b/lib/keyringer/actions/decrypt
index bab9b34..2b1401c 100755
--- a/share/keyringer/decrypt
+++ b/lib/keyringer/actions/decrypt
@@ -4,7 +4,7 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer/functions"
+LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 # Get file
diff --git a/share/keyringer/del b/lib/keyringer/actions/del
index 4eca0e3..babd212 100755
--- a/share/keyringer/del
+++ b/lib/keyringer/actions/del
@@ -4,7 +4,7 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer/functions"
+LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 # Get file
diff --git a/share/keyringer/edit b/lib/keyringer/actions/edit
index fe05ecc..54d0fec 100755
--- a/share/keyringer/edit
+++ b/lib/keyringer/actions/edit
@@ -4,7 +4,7 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer/functions"
+LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 # Get file
diff --git a/share/keyringer/encrypt b/lib/keyringer/actions/encrypt
index ac305a4..cc73b55 100755
--- a/share/keyringer/encrypt
+++ b/lib/keyringer/actions/encrypt
@@ -4,7 +4,7 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer/functions"
+LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 # Aditional parameters
diff --git a/share/keyringer/encrypt-batch b/lib/keyringer/actions/encrypt-batch
index 8267197..8267197 120000
--- a/share/keyringer/encrypt-batch
+++ b/lib/keyringer/actions/encrypt-batch
diff --git a/share/keyringer/genpair b/lib/keyringer/actions/genpair
index f977714..f048bc7 100755
--- a/share/keyringer/genpair
+++ b/lib/keyringer/actions/genpair
@@ -179,8 +179,8 @@ EOF
 }
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer"
-source "$LIB/functions" || exit 1
+LIB="`dirname $0`/../functions"
+source "$LIB" || exit 1
 
 # Aditional parameters
 KEYTYPE="$2"
diff --git a/share/keyringer/git b/lib/keyringer/actions/git
index cd2a188..3c4f435 100755
--- a/share/keyringer/git
+++ b/lib/keyringer/actions/git
@@ -4,7 +4,7 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer/functions"
+LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 # Aditional parameters
diff --git a/share/keyringer/ls b/lib/keyringer/actions/ls
index 31e8805..ec8080b 100755
--- a/share/keyringer/ls
+++ b/lib/keyringer/actions/ls
@@ -4,7 +4,7 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer/functions"
+LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 # Aditional parameters
diff --git a/share/keyringer/open b/lib/keyringer/actions/open
index 8491ab9..8491ab9 120000
--- a/share/keyringer/open
+++ b/lib/keyringer/actions/open
diff --git a/share/keyringer/options b/lib/keyringer/actions/options
index 3047380..8508aea 100755
--- a/share/keyringer/options
+++ b/lib/keyringer/actions/options
@@ -4,8 +4,8 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer"
-source "$LIB/functions" || exit 1
+LIB="`dirname $0`/../functions"
+source "$LIB" || exit 1
 
 # Command parser
 keyringer_get_command "$2"
diff --git a/share/keyringer/preferences b/lib/keyringer/actions/preferences
index 2819b50..e82848d 100755
--- a/share/keyringer/preferences
+++ b/lib/keyringer/actions/preferences
@@ -4,7 +4,7 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer/functions"
+LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 COMMAND="$2"
diff --git a/share/keyringer/recipients b/lib/keyringer/actions/recipients
index 0460842..7093a6b 100755
--- a/share/keyringer/recipients
+++ b/lib/keyringer/actions/recipients
@@ -4,8 +4,8 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer"
-source "$LIB/functions" || exit 1
+LIB="`dirname $0`/../functions"
+source "$LIB" || exit 1
 
 # Command parser
 keyringer_get_command "$2"
diff --git a/share/keyringer/recrypt b/lib/keyringer/actions/recrypt
index 63f7bc6..014fef7 100755
--- a/share/keyringer/recrypt
+++ b/lib/keyringer/actions/recrypt
@@ -4,7 +4,7 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer/functions"
+LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 function keyringer_recrypt {
diff --git a/share/keyringer/usage b/lib/keyringer/actions/usage
index a4602ac..f4ac0fa 100755
--- a/share/keyringer/usage
+++ b/lib/keyringer/actions/usage
@@ -4,7 +4,7 @@
 #
 
 # Load functions
-LIB="`dirname $0`/../../lib/keyringer/functions"
+LIB="`dirname $0`/../functions"
 source "$LIB" || exit 1
 
 keyringer_usage