Should use $CURRENT_CFG_METHOD when saving profile

[deb_pkgs/autorandr.git] / autorandr

diff --git a/autorandr b/autorandr
index c603473529ba788e8194664dd5ef0caf0954adb7..70e3c7a2a311028b428822d0c5efa8fbb154e826 100755 (executable)
--- a/autorandr
+++ b/autorandr
@@ -61,12 +61,16 @@ LOAD_METHOD="load_cfg_xrandr"
 SCRIPTNAME="$(basename $0)"
 # when called as autodisper/auto-disper, we assume different defaults
 if [ "$SCRIPTNAME" = "auto-disper" ] || [ "$SCRIPTNAME" = "autodisper" ]; then
+       echo "Assuming disper defaults..." >&2
        FP_METHODS="setup_fp_disper"
        CURRENT_CFG_METHOD="current_cfg_disper"
        LOAD_METHOD="load_cfg_disper"
 fi
 
-test -f $CONFIG && . $CONFIG 
+if [ -f $CONFIG ]; then
+       echo "Loading configuration from '$CONFIG'" >&2
+       . $CONFIG
+fi
 
 setup_fp_xrandr_edid() {
        $XRANDR -q --verbose | awk '
@@ -97,7 +101,9 @@ setup_fp() {
        local FP="";
        for M in $FP_METHODS; do
                FP="$($M)"
-               [ -n "$FP" ] && break;
+               if [ -n "$FP" ]; then
+                       break
+               fi
        done
        if [ -z "$FP" ]; then
                echo "Unable to fingerprint display configuration" >&2
@@ -125,7 +131,7 @@ current_cfg_disper() {
 }
 
 current_cfg() {
-       $CURRENT_METHOD;
+       $CURRENT_CFG_METHOD;
 }
 
 blocked() {
@@ -150,7 +156,7 @@ load_cfg_xrandr() {
 }
 
 load_cfg_disper() {
-       $DISPER < -i < "$1"
+       $DISPER -i < "$1"
 }
 
 load() {
@@ -223,7 +229,7 @@ if [ -n "$SAVE_PROFILE" ]; then
        echo "Saving current configuration as profile '${SAVE_PROFILE}'"
        mkdir -p "$PROFILES/$SAVE_PROFILE"
        echo "$CURRENT_SETUP" > "$PROFILES/$SAVE_PROFILE/setup"
-       current_cfg > "$PROFILES/$SAVE_PROFILE/config"
+       $CURRENT_CFG_METHOD > "$PROFILES/$SAVE_PROFILE/config"
        exit 0
 fi