aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorricola <ricola@poivron.org>2012-10-19 22:09:00 +0200
committerricola <ricola@poivron.org>2012-10-19 22:10:22 +0200
commitf55d13ca7d9c499d34a977b58ed50df18b04b864 (patch)
tree9434491e7d4512aeffbec80897b50bb4e4102188
parentb64c3185714b73f3134c907006cc8097bbed09e8 (diff)
downloadkeyringer-f55d13ca7d9c499d34a977b58ed50df18b04b864.tar.gz
keyringer-f55d13ca7d9c499d34a977b58ed50df18b04b864.tar.bz2
Move the 'preferences' action to a separate file
-rwxr-xr-xkeyringer29
-rwxr-xr-xshare/keyringer/preferences32
2 files changed, 32 insertions, 29 deletions
diff --git a/keyringer b/keyringer
index a59fd2f..0f6372c 100755
--- a/keyringer
+++ b/keyringer
@@ -104,33 +104,6 @@ function keyringer_dispatch {
fi
}
-function keyringer_preferences {
- COMMAND="$3"
-
- if [ -z "$COMMAND" ]; then
- echo "Usage: keyringer <keyring> `basename $0` <command> [arguments]"
- exit 1
- fi
-
- # Create options file if old repository
- if [ ! -e "$PREFERENCES" ]; then
- echo "Creating preferences file..."
- touch "$PREFERENCES"
- fi
-
- if [ "$COMMAND" == "ls" ]; then
- cat "$PREFERENCES"
- elif [ "$COMMAND" == "edit" ]; then
- "$EDITOR" "$PREFERENCES"
- elif [ "$COMMAND" == "add" ]; then
- shift 3
- echo $* >> "$PREFERENCES"
- else
- printf "%s: No such command %s\n" "$BASENAME" "$COMMAND"
- exit 1
- fi
-}
-
# Config
NAME="keyringer"
KEYRINGER_VERSION="0.1"
@@ -176,8 +149,6 @@ fi
if [ "$ACTION" == "init" ]; then
keyringer_init $*
-elif [ "$ACTION" == "preferences" ]; then
- keyringer_preferences $*
elif keyringer_has_action "$ACTION"; then
keyringer_dispatch $*
else
diff --git a/share/keyringer/preferences b/share/keyringer/preferences
new file mode 100755
index 0000000..65b38f3
--- /dev/null
+++ b/share/keyringer/preferences
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# Manipulate preferences.
+#
+
+# Load functions
+LIB="`dirname $0`/../../lib/keyringer/functions"
+source "$LIB" || exit 1
+
+COMMAND="$2"
+
+if [ -z "$COMMAND" ]; then
+ echo "Usage: keyringer <keyring> $ACTION <command> [arguments]"
+ exit 1
+fi
+
+# Create options file if old repository
+if [ ! -e "$PREFERENCES" ]; then
+ echo "Creating preferences file..."
+ touch "$PREFERENCES"
+fi
+
+if [ "$COMMAND" == "ls" ]; then
+ cat "$PREFERENCES"
+elif [ "$COMMAND" == "edit" ]; then
+ "$EDITOR" "$PREFERENCES"
+elif [ "$COMMAND" == "add" ]; then
+ shift 2
+else
+ printf "%s: No such command %s\n" "$BASENAME" "$COMMAND"
+ exit 1
+fi