FHS compliance (closes #18)

diff --git a/Makefile b/Makefile
index 374579c75ca45bebb2fff72b986efe26fc2c7340..7d734ff9b00db662c221ae1f2b4ce73dccf43d17 100644 (file)
--- 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 a4e8b2c1145c25e0aad8969c0e55e73652f69658..604ef1dbbf86066e6678052fb86d50d749598a25 100755 (executable)
--- 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
similarity index 94%
rename from share/keyringer/append
rename to lib/keyringer/actions/append
index bcc9e5e709e55166d1debefd7aa2bbfc207c2775..30c2d5bce1f43a2c19aa7ff9c1fff7ad56bc474c 100755 (executable)
--- 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
similarity index 100%
rename from share/keyringer/append-batch
rename to lib/keyringer/actions/append-batch

diff --git a/share/keyringer/commands b/lib/keyringer/actions/commands
similarity index 68%
rename from share/keyringer/commands
rename to lib/keyringer/actions/commands
index 139725a79a9cc7dfad3cab4772e15977cd83a46b..26056664fc25e403a542ee2f900427cef06b61a3 100755 (executable)
--- 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
similarity index 78%
rename from share/keyringer/decrypt
rename to lib/keyringer/actions/decrypt
index bab9b34c4dad2cb256ee78ce18d7658b4df6bb4b..2b1401c70f32367215a0ac0d775ee14b2c47be65 100755 (executable)
--- 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
similarity index 80%
rename from share/keyringer/del
rename to lib/keyringer/actions/del
index 4eca0e39d6c120cab10fb55485241e39bb00ac35..babd2123713993cfad71e7059339a411ff735dba 100755 (executable)
--- 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
similarity index 94%
rename from share/keyringer/edit
rename to lib/keyringer/actions/edit
index fe05ecc7ee390292aab91cd23fb8fdfbeda23809..54d0fecc0692e894682c7ecfac0ce4cbf042f0bb 100755 (executable)
--- 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
similarity index 95%
rename from share/keyringer/encrypt
rename to lib/keyringer/actions/encrypt
index ac305a422aa015d24c91058e8c611bccaabe9a11..cc73b55796e7cebb6f0b27f93c3cf3d0c943d32b 100755 (executable)
--- 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
similarity index 100%
rename from share/keyringer/encrypt-batch
rename to lib/keyringer/actions/encrypt-batch

diff --git a/share/keyringer/genpair b/lib/keyringer/actions/genpair
similarity index 98%
rename from share/keyringer/genpair
rename to lib/keyringer/actions/genpair
index f9777143c4caa05f3bb5496c2aac723ab7c2f363..f048bc7f38268b904e5b45f8d5e3f722be7075fe 100755 (executable)
--- 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
similarity index 79%
rename from share/keyringer/git
rename to lib/keyringer/actions/git
index cd2a188e38b8b042709d4d1119a7e98f159ba825..3c4f4357640147f93261c82b9d86a0f59b028e94 100755 (executable)
--- 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
similarity index 77%
rename from share/keyringer/ls
rename to lib/keyringer/actions/ls
index 31e88050c483f080025e52ec807f9a16cb79a0c8..ec8080bbc52c57df0f8013e5cc4036ad11108b78 100755 (executable)
--- 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
similarity index 100%
rename from share/keyringer/open
rename to lib/keyringer/actions/open

diff --git a/share/keyringer/options b/lib/keyringer/actions/options
similarity index 87%
rename from share/keyringer/options
rename to lib/keyringer/actions/options
index 3047380d7d9a34cd7803b70d7e82aee2c002fdfd..8508aeaa2769f4313a0ccdd11daebbb9e17e0331 100755 (executable)
--- 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
similarity index 93%
rename from share/keyringer/preferences
rename to lib/keyringer/actions/preferences
index 2819b50878e70ecd955aa4099d99b1ee10de636e..e82848df80fc326935162f973f37b5fcc2f0bfd0 100755 (executable)
--- 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
similarity index 93%
rename from share/keyringer/recipients
rename to lib/keyringer/actions/recipients
index 0460842f4de7ca6effc65bc7638fa051d121a9fa..7093a6b78157310c9155c4dc20f5496a6169b12c 100755 (executable)
--- 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
similarity index 94%
rename from share/keyringer/recrypt
rename to lib/keyringer/actions/recrypt
index 63f7bc679a0ac44a3d62463e3b2c7d0b2713bd5a..014fef71539774368473cc746f425577f858c2dd 100755 (executable)
--- 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
similarity index 67%
rename from share/keyringer/usage
rename to lib/keyringer/actions/usage
index a4602acc3e6f214b7283651e4c19f6d2c39f1ca9..f4ac0fa9cd23b2b7f1ee529cc8a660331bf3ef8e 100755 (executable)
--- 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