From 0cd51db3285474623b8c96e1bcf408a27aa4fe76 Mon Sep 17 00:00:00 2001 From: Karma Riuk Date: Sun, 7 Mar 2021 23:22:17 +0100 Subject: [PATCH] Corrected a huge mistake in the checkout_config method --- brightctl | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/brightctl b/brightctl index c2665b4..6fccfe6 100755 --- a/brightctl +++ b/brightctl @@ -50,13 +50,18 @@ get_parser_location () { checkout_config () { local parser_location="$(get_parser_location)" - [[ -z "$parser_location" ]] && verbose && echo "Unable to find the 'read_ini.sh' file, which is used to read the config file. Will be using the default vlaues of the script." && return 0 - - verbose && echo "Sourcing the ini parser" - source "$parser_location" - - verbose && echo "Reading the config file" - read_ini "$CONFIG_PATH" + if [[ ! -z "$parser_location" ]]; then + verbose && echo "Sourcing the ini parser" + source "$parser_location" + if [[ -f "$CONFIG_PATH" ]]; then + verbose && echo "Reading the config file '$CONFIG_PATH'" + read_ini "$CONFIG_PATH" + else + verbose && echo "Unable to find the config file '$CONFIG_PATH', using default script values" + fi + else + verbose && echo "Unable to find the 'read_ini.sh' file, which is used to read the config file. Will be using the default vlaues of the script." + fi BRIGHTNESS_CONTROLLER=${INI__Controller__brightness_controller:-$DEFAULT_BRIGHTNESS_CONTROLLER} INCREASE_FLAG=${INI__Controller__increase_flag:-$DEFAULT_INCREASE_FLAG} @@ -73,20 +78,20 @@ checkout_config () { NOTIFICATION_ENABLED=${INI__Notification__enabled:-$DEFAULT_NOTIFICATION_ENABLED} NOTIFICATION_TIMEOUT=${INI__Notification__timeout:-$DEFAULT_NOTIFICATION_TIMEOUT} - verbose && echo "" && echo "After parsing the config file, variables are:" && \ - echo "BRIGHTNESS_CONTROLLER: '$BRIGHTNESS_CONTROLLER'" && \ - echo "INCREASE_FLAG: '$INCREASE_FLAG'" && \ - echo "DECREASE_FLAG: '$DECREASE_FLAG'" && \ - echo "SET_BRIGHTNESS_FLAG: '$SET_BRIGHTNESS_FLAG'" && \ - echo "GET_BRIGHTNESS_FLAG: '$GET_BRIGHTNESS_FLAG'" && \ - echo "ADDITIONAL_FLAGS: '$ADDITIONAL_FLAGS'" && \ - echo "NORMAL_DELTA: '$NORMAL_DELTA'" && \ - echo "BIG_DELTA: '$BIG_DELTA'" && \ - echo "BRIGTHNESS_MAX: '$BRIGTHNESS_MAX'" && \ - echo "BRIGTHNESS_MIN: '$BRIGTHNESS_MIN'" && \ - echo "NOTIFICATION_ENABLED: '$NOTIFICATION_ENABLED'" && \ - echo "NOTIFICATION_TIMEOUT: '$NOTIFICATION_TIMEOUT'" && \ - echo "" + verbose && echo "" && echo "Variables are:" && \ + echo "BRIGHTNESS_CONTROLLER: '$BRIGHTNESS_CONTROLLER'" && \ + echo "INCREASE_FLAG: '$INCREASE_FLAG'" && \ + echo "DECREASE_FLAG: '$DECREASE_FLAG'" && \ + echo "SET_BRIGHTNESS_FLAG: '$SET_BRIGHTNESS_FLAG'" && \ + echo "GET_BRIGHTNESS_FLAG: '$GET_BRIGHTNESS_FLAG'" && \ + echo "ADDITIONAL_FLAGS: '$ADDITIONAL_FLAGS'" && \ + echo "NORMAL_DELTA: '$NORMAL_DELTA'" && \ + echo "BIG_DELTA: '$BIG_DELTA'" && \ + echo "BRIGTHNESS_MAX: '$BRIGTHNESS_MAX'" && \ + echo "BRIGTHNESS_MIN: '$BRIGTHNESS_MIN'" && \ + echo "NOTIFICATION_ENABLED: '$NOTIFICATION_ENABLED'" && \ + echo "NOTIFICATION_TIMEOUT: '$NOTIFICATION_TIMEOUT'" && \ + echo "" } @@ -94,7 +99,7 @@ notify () { local brightness=$(get_brightness | sed 's/\..*$//') local cmd="dunstify -h int:value:$brightness -t $NOTIFICATION_TIMEOUT -h string:x-dunst-stack-tag:volume -i \"xfpm-brightness-lcd\" \"Brightness ($brightness%)\"" [[ $NOTIFICATION_ENABLED -eq 1 ]] && sh -c "$cmd" - verbose && ( [[ $NOTIFICATION_ENABLED -eq 1 ]] && echo "Notified with \`$cmd\`" || echo "Didn't notify" ) + # verbose && ( [[ $NOTIFICATION_ENABLED -eq 1 ]] && echo "Notified with \`$cmd\`" || echo "Didn't notify" ) } brightness_up_by () {