Check if config version is supported by keyringer

diff --git a/keyringer b/keyringer
index 890468532d308d132f3f9212cdbd25d4b73666cd..8a6eeb169cbb328400c7eac05106c34515e0c055 100755 (executable)
--- a/keyringer
+++ b/keyringer
@@ -129,14 +129,16 @@ function keyringer_preferences {
 
 # Config
 NAME="keyringer"
+KEYRINGER_VERSION="0.1"
 CONFIG="$HOME/.$NAME/config"
 BASENAME="`basename $0`"
 KEYRING="$1"
 ACTION="$2"
 ACTIONS="`dirname $(readlink -f $0)`/share/$NAME"
 
-# Export preferences for other scripts
+# Export preferences and version for other scripts
 export PREFERENCES="`dirname $CONFIG`/$KEYRING"
+export KEYRINGER_VERSION
 
 # Load functions
 LIB="`dirname $(readlink -f $0)`/lib/$NAME/functions"

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index a1c95a86051152bd731e82cce0f246b33f64ccd4..8166370d4dd5780c83fc04123519c18f18d8e47a 100644 (file)
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -234,6 +234,16 @@ function keyringer_check_version {
   fi
 
   VERSION="`cat $VERSION_INFO`"
+
+  # Check if config version is supported by keyringer
+  if [ "$VERSION" != "$KEYRINGER_VERSION" ]; then
+    NEWEST="`echo -e "$VERSION\n$KEYRINGER_VERSION" | sort -V | tail -n 1`"
+    if [ "$NEWEST" == "$VERSION" ]; then
+      echo "Fatal: keyringer version: $KEYRINGER_VERSION / config version: $VERSION"
+      echo "Please upgrade your keyringer application"
+      exit 1
+    fi
+  fi
 }
 
 # Configuration upgrades