From 2b8d308b4f89152e0fdbf817206dbc7e6c532cf0 Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Mon, 29 Jan 2024 14:38:40 +0700 Subject: [PATCH] fix some shellcheck warnings --- .../scripts/color_generation/applycolor.sh | 8 +++--- .../ags/scripts/color_generation/colorgen.sh | 27 +++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.config/ags/scripts/color_generation/applycolor.sh b/.config/ags/scripts/color_generation/applycolor.sh index a1073be6a..b0b206e08 100755 --- a/.config/ags/scripts/color_generation/applycolor.sh +++ b/.config/ags/scripts/color_generation/applycolor.sh @@ -105,8 +105,8 @@ apply_term() { echo "Template file not found for Terminal. Skipping that." return fi - if [ ! -d $HOME/.cache/ags/user/colorschemes ]; then - mkdir -p $HOME/.cache/ags/user/colorschemes + if [ ! -d "$HOME/.cache/ags/user/colorschemes" ]; then + mkdir -p "$HOME/.cache/ags/user/colorschemes" fi # Copy template cp "scripts/templates/terminal/sequences.material" "$HOME/.cache/ags/user/colorschemes/sequences" @@ -117,7 +117,7 @@ apply_term() { for file in /dev/pts/*; do if [[ $file =~ ^/dev/pts/[0-9]+$ ]]; then - cat "$HOME/.cache/ags/user/colorschemes/sequences" > $file + cat "$HOME/.cache/ags/user/colorschemes/sequences" > "$file" fi done } @@ -175,4 +175,4 @@ apply_hyprland & apply_gtk & apply_gtklock & apply_fuzzel & -apply_term +apply_term & diff --git a/.config/ags/scripts/color_generation/colorgen.sh b/.config/ags/scripts/color_generation/colorgen.sh index 15d03f271..43a5c7f68 100755 --- a/.config/ags/scripts/color_generation/colorgen.sh +++ b/.config/ags/scripts/color_generation/colorgen.sh @@ -23,38 +23,37 @@ fi cd "$HOME/.config/ags/scripts/" || exit if [[ "$1" = "#"* ]]; then # this is a color - color_generation/generate_colors_material.py --color "$1" "$lightdark" > $HOME/.cache/ags/user/generated_colors.txt + color_generation/generate_colors_material.py --color "$1" "$lightdark" > "$HOME/.cache/ags/user/generated_colors.txt" if [ "$2" = "--apply" ]; then - cp $HOME/.cache/ags/user/generated_colors.txt "$HOME/.config/ags/scss/_material.scss" + cp "$HOME/.cache/ags/user/generated_colors.txt" "$HOME/.config/ags/scss/_material.scss" color_generation/applycolor.sh fi elif [ "$backend" = "material" ]; then - color_generation/generate_colors_material.py --path "$1" "$lightdark" > $HOME/.cache/ags/user/generated_colors.txt + color_generation/generate_colors_material.py --path "$1" "$lightdark" > "$HOME/.cache/ags/user/generated_colors.txt" if [ "$2" = "--apply" ]; then - cp $HOME/.cache/ags/user/generated_colors.txt "$HOME/.config/ags/scss/_material.scss" + cp "$HOME/.cache/ags/user/generated_colors.txt" "$HOME/.config/ags/scss/_material.scss" color_generation/applycolor.sh fi elif [ "$backend" = "pywal" ]; then # clear and generate wal -c - #echo wal -i "$1" -n -t -s -e "$lightdark" -q wal -i "$1" -n $lightdark -q # copy scss - cp "$HOME/.cache/wal/colors.scss" $HOME/.cache/ags/user/generated_colors.txt + cp "$HOME/.cache/wal/colors.scss" "$HOME/.cache/ags/user/generated_colors.txt" - cat color_generation/pywal_to_material.scss >> $HOME/.cache/ags/user/generated_colors.txt + cat color_generation/pywal_to_material.scss >> "$HOME/.cache/ags/user/generated_colors.txt" if [ "$2" = "--apply" ]; then - sassc $HOME/.cache/ags/user/generated_colors.txt $HOME/.cache/ags/user/generated_colors_classes.scss --style compact - sed -i "s/ { color//g" $HOME/.cache/ags/user/generated_colors_classes.scss - sed -i "s/\./$/g" $HOME/.cache/ags/user/generated_colors_classes.scss - sed -i "s/}//g" $HOME/.cache/ags/user/generated_colors_classes.scss + sassc "$HOME/.cache/ags/user/generated_colors.txt" "$HOME/.cache/ags/user/generated_colors_classes.scss" --style compact + sed -i "s/ { color//g" "$HOME/.cache/ags/user/generated_colors_classes.scss" + sed -i "s/\./$/g" "$HOME/.cache/ags/user/generated_colors_classes.scss" + sed -i "s/}//g" "$HOME/.cache/ags/user/generated_colors_classes.scss" if [ "$lightdark" = "-l" ]; then - printf "\n"'$darkmode: false;'"\n" >> $HOME/.cache/ags/user/generated_colors_classes.scss + printf "\n""\$darkmode: false;""\n" >> "$HOME/.cache/ags/user/generated_colors_classes.scss" else - printf "\n"'$darkmode: true;'"\n" >> $HOME/.cache/ags/user/generated_colors_classes.scss + printf "\n""\$darkmode: true;""\n" >> "$HOME/.cache/ags/user/generated_colors_classes.scss" fi - cp $HOME/.cache/ags/user/generated_colors_classes.scss "$HOME/.config/ags/scss/_material.scss" + cp "$HOME/.cache/ags/user/generated_colors_classes.scss" "$HOME/.config/ags/scss/_material.scss" color_generation/applycolor.sh fi