diff --git a/files/applets/shared/theme.bash b/files/applets/shared/theme.bash index 46fe5a8..eeaa274 100755 --- a/files/applets/shared/theme.bash +++ b/files/applets/shared/theme.bash @@ -2,8 +2,6 @@ DEFAULT_TYPE='type-1' DEFAULT_STYLE='style-1' -echo $SCRIPT_DIR - # INPUT_THEME should be set by the script that sources this file, # if the user wants to override the default theme. if [ -z "$INPUT_THEME" ]; then @@ -12,15 +10,10 @@ elif [[ $1 == "-h" || $1 == "--help" ]]; then echo "Usage: $SCRIPT_INVOCATION [theme]" exit 0 else - theme="$INPUT_THEME" - if [ ! -d $theme ]; then - # prepend current script path if theme is not found - theme="$SCRIPT_DIR/../$theme" - - if [ ! -d "$theme" ]; then - # fail if we still can't find it. - echo "Theme not found!" - exit 1 - fi + theme="$SCRIPT_DIR/../$theme.rasi" + if [ ! -f "$theme" ]; then + # fail if we still can't find it. + echo "Theme not found!" + exit 1 fi fi diff --git a/files/applets/type-4/style-1.rasi b/files/applets/type-4/style-1.rasi index 1823c56..0c4a002 100644 --- a/files/applets/type-4/style-1.rasi +++ b/files/applets/type-4/style-1.rasi @@ -64,7 +64,7 @@ inputbar { border-radius: 0px; border-color: @selected; background-color: transparent; - background-image: url("~/.config/rofi/images/a.png", width); + background-image: url("./images/a.png", width); text-color: @foreground; children: [ "textbox-prompt-colon", "prompt"]; } diff --git a/files/applets/type-4/style-2.rasi b/files/applets/type-4/style-2.rasi index 40a98ac..b90ab22 100644 --- a/files/applets/type-4/style-2.rasi +++ b/files/applets/type-4/style-2.rasi @@ -64,7 +64,7 @@ inputbar { border-radius: 20px; border-color: @selected; background-color: transparent; - background-image: url("~/.config/rofi/images/d.png", width); + background-image: url("./images/d.png", width); text-color: @foreground; children: [ "dummy", "textbox-prompt-colon", "prompt", "dummy"]; } diff --git a/files/applets/type-4/style-3.rasi b/files/applets/type-4/style-3.rasi index 0199650..2280c67 100644 --- a/files/applets/type-4/style-3.rasi +++ b/files/applets/type-4/style-3.rasi @@ -64,7 +64,7 @@ inputbar { border-radius: 40px; border-color: @selected; background-color: transparent; - background-image: url("~/.config/rofi/images/i.jpg", width); + background-image: url("./images/i.jpg", width); text-color: @foreground; children: [ "textbox-prompt-colon", "dummy", "prompt"]; } diff --git a/files/applets/type-5/style-1.rasi b/files/applets/type-5/style-1.rasi index 0fdc43d..15fbf9e 100644 --- a/files/applets/type-5/style-1.rasi +++ b/files/applets/type-5/style-1.rasi @@ -59,7 +59,7 @@ mainbox { /*****----- Imagebox -----*****/ imagebox { background-color: transparent; - background-image: url("~/.config/rofi/images/e.jpg", height); + background-image: url("./images/e.jpg", height); children: [ "dummy", "inputbar", "dummy" ]; } diff --git a/files/applets/type-5/style-2.rasi b/files/applets/type-5/style-2.rasi index 5b9c5b1..aee5de0 100644 --- a/files/applets/type-5/style-2.rasi +++ b/files/applets/type-5/style-2.rasi @@ -60,7 +60,7 @@ mainbox { imagebox { border-radius: 20px; background-color: transparent; - background-image: url("~/.config/rofi/images/j.jpg", height); + background-image: url("./images/j.jpg", height); children: [ "dummy", "inputbar", "dummy" ]; } diff --git a/files/applets/type-5/style-3.rasi b/files/applets/type-5/style-3.rasi index 416f51b..58bc082 100644 --- a/files/applets/type-5/style-3.rasi +++ b/files/applets/type-5/style-3.rasi @@ -62,7 +62,7 @@ imagebox { border-radius: 100%; border-color: @selected; background-color: transparent; - background-image: url("~/.config/rofi/images/g.png", height); + background-image: url("./images/g.png", height); children: [ "dummy", "inputbar", "dummy" ]; } diff --git a/files/launchers/type-1/launcher.sh b/files/launchers/type-1/launcher.sh index 6e532c4..f8b464a 100755 --- a/files/launchers/type-1/launcher.sh +++ b/files/launchers/type-1/launcher.sh @@ -12,23 +12,15 @@ ## style-11 style-12 style-13 style-14 style-15 INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-1' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..15]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '15' "$INPUT_THEME") + +if [ $? -ne 0 ]; then + echo $theme + exit 1 fi - - ## Run rofi \ -show drun \ - -theme ${dir}/${theme}.rasi + -theme $theme diff --git a/files/launchers/type-2/launcher.sh b/files/launchers/type-2/launcher.sh index 1917b31..f8b464a 100755 --- a/files/launchers/type-2/launcher.sh +++ b/files/launchers/type-2/launcher.sh @@ -12,22 +12,15 @@ ## style-11 style-12 style-13 style-14 style-15 INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-1' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..15]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi -fi +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '15' "$INPUT_THEME") +if [ $? -ne 0 ]; then + echo $theme + exit 1 +fi ## Run rofi \ -show drun \ - -theme ${dir}/${theme}.rasi + -theme $theme diff --git a/files/launchers/type-3/launcher.sh b/files/launchers/type-3/launcher.sh index e694879..2d383bd 100755 --- a/files/launchers/type-3/launcher.sh +++ b/files/launchers/type-3/launcher.sh @@ -11,22 +11,17 @@ ## style-6 style-7 style-8 style-9 style-10 INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-10' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..10]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '10' '10' "$INPUT_THEME") + +if [ $? -ne 0 ]; then + echo $theme + exit 1 fi + ## Run rofi \ -show drun \ - -theme ${dir}/${theme}.rasi + -theme $theme diff --git a/files/launchers/type-4/launcher.sh b/files/launchers/type-4/launcher.sh index 9f950ea..ee0c7f9 100755 --- a/files/launchers/type-4/launcher.sh +++ b/files/launchers/type-4/launcher.sh @@ -9,23 +9,17 @@ # ## style-1 style-2 style-3 style-4 style-5 ## style-6 style-7 style-8 style-9 style-10 -INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-1' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..10]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi -fi +INPUT_THEME=$1 +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '10' "$INPUT_THEME") + +if [ $? -ne 0 ]; then + echo $theme + exit 1 +fi ## Run rofi \ -show drun \ - -theme ${dir}/${theme}.rasi + -theme $theme diff --git a/files/launchers/type-5/launcher.sh b/files/launchers/type-5/launcher.sh index 6b5e812..e02b1d2 100755 --- a/files/launchers/type-5/launcher.sh +++ b/files/launchers/type-5/launcher.sh @@ -8,23 +8,17 @@ ## Available Styles # ## style-1 style-2 style-3 style-4 style-5 -INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-1' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..5]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi -fi +INPUT_THEME=$1 +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '5' "$INPUT_THEME") + +if [ $? -ne 0 ]; then + echo $theme + exit 1 +fi ## Run rofi \ -show drun \ - -theme ${dir}/${theme}.rasi + -theme $theme diff --git a/files/launchers/type-5/style-1.rasi b/files/launchers/type-5/style-1.rasi index 21d8cba..abc859a 100644 --- a/files/launchers/type-5/style-1.rasi +++ b/files/launchers/type-5/style-1.rasi @@ -39,7 +39,7 @@ window { border-radius: 0px; border-color: black; cursor: "default"; - background-image: url("~/.config/rofi/images/paper.png", none); + background-image: url("./images/paper.png", none); } /*****----- Main Box -----*****/ diff --git a/files/launchers/type-5/style-2.rasi b/files/launchers/type-5/style-2.rasi index 185718f..31073bd 100644 --- a/files/launchers/type-5/style-2.rasi +++ b/files/launchers/type-5/style-2.rasi @@ -41,7 +41,7 @@ window { padding: 0px; border-radius: 12px; cursor: "default"; - background-image: url("~/.config/rofi/images/gradient.png", width); + background-image: url("./images/gradient.png", width); } /*****----- Main Box -----*****/ diff --git a/files/launchers/type-5/style-5.rasi b/files/launchers/type-5/style-5.rasi index 60e4e22..1c21f27 100644 --- a/files/launchers/type-5/style-5.rasi +++ b/files/launchers/type-5/style-5.rasi @@ -42,7 +42,7 @@ window { border-radius: 20px; cursor: "default"; background-color: #162022; - background-image: url("~/.config/rofi/images/flowers-1.png", width); + background-image: url("./images/flowers-1.png", width); } /*****----- Main Box -----*****/ @@ -63,7 +63,7 @@ inputbar { border: 2px; border-radius: 20px; border-color: white; - background-image: url("~/.config/rofi/images/flowers-3.png", none); + background-image: url("./images/flowers-3.png", none); children: [ "textbox-prompt-colon", "entry" ]; } @@ -108,7 +108,7 @@ listview { border: 2px; border-radius: 20px; border-color: white; - background-image: url("~/.config/rofi/images/flowers-2.png", width); + background-image: url("./images/flowers-2.png", width); cursor: "default"; } diff --git a/files/launchers/type-6/launcher.sh b/files/launchers/type-6/launcher.sh index 9f950ea..85e3579 100755 --- a/files/launchers/type-6/launcher.sh +++ b/files/launchers/type-6/launcher.sh @@ -10,22 +10,15 @@ ## style-1 style-2 style-3 style-4 style-5 ## style-6 style-7 style-8 style-9 style-10 INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-1' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..10]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi -fi +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '10' "$INPUT_THEME") +if [ $? -ne 0 ]; then + echo $theme + exit 1 +fi ## Run rofi \ -show drun \ - -theme ${dir}/${theme}.rasi + -theme $theme diff --git a/files/launchers/type-6/style-1.rasi b/files/launchers/type-6/style-1.rasi index 198a4e0..af3b0c7 100644 --- a/files/launchers/type-6/style-1.rasi +++ b/files/launchers/type-6/style-1.rasi @@ -60,7 +60,7 @@ mainbox { imagebox { padding: 20px; background-color: transparent; - background-image: url("~/.config/rofi/images/a.png", height); + background-image: url("./images/a.png", height); orientation: vertical; children: [ "inputbar", "dummy", "mode-switcher" ]; } diff --git a/files/launchers/type-6/style-10.rasi b/files/launchers/type-6/style-10.rasi index 07c375d..adfd9f3 100644 --- a/files/launchers/type-6/style-10.rasi +++ b/files/launchers/type-6/style-10.rasi @@ -60,7 +60,7 @@ mainbox { imagebox { padding: 20px; background-color: transparent; - background-image: url("~/.config/rofi/images/j.jpg", height); + background-image: url("./images/j.jpg", height); orientation: vertical; children: [ "inputbar", "dummy", "mode-switcher" ]; } diff --git a/files/launchers/type-6/style-2.rasi b/files/launchers/type-6/style-2.rasi index 66a1de6..e13563b 100644 --- a/files/launchers/type-6/style-2.rasi +++ b/files/launchers/type-6/style-2.rasi @@ -60,7 +60,7 @@ mainbox { imagebox { padding: 20px; background-color: transparent; - background-image: url("~/.config/rofi/images/b.png", height); + background-image: url("./images/b.png", height); orientation: vertical; children: [ "inputbar", "dummy", "mode-switcher" ]; } diff --git a/files/launchers/type-6/style-3.rasi b/files/launchers/type-6/style-3.rasi index a623e2f..d43cd0b 100644 --- a/files/launchers/type-6/style-3.rasi +++ b/files/launchers/type-6/style-3.rasi @@ -60,7 +60,7 @@ mainbox { imagebox { padding: 20px; background-color: transparent; - background-image: url("~/.config/rofi/images/c.png", height); + background-image: url("./images/c.png", height); orientation: vertical; children: [ "inputbar", "dummy", "mode-switcher" ]; } diff --git a/files/launchers/type-6/style-4.rasi b/files/launchers/type-6/style-4.rasi index ddf2be1..7260a58 100644 --- a/files/launchers/type-6/style-4.rasi +++ b/files/launchers/type-6/style-4.rasi @@ -60,7 +60,7 @@ mainbox { imagebox { padding: 20px; background-color: transparent; - background-image: url("~/.config/rofi/images/d.png", height); + background-image: url("./images/d.png", height); orientation: vertical; children: [ "inputbar", "dummy", "mode-switcher" ]; } diff --git a/files/launchers/type-6/style-5.rasi b/files/launchers/type-6/style-5.rasi index afc90fb..03cc6af 100644 --- a/files/launchers/type-6/style-5.rasi +++ b/files/launchers/type-6/style-5.rasi @@ -60,7 +60,7 @@ mainbox { imagebox { padding: 20px; background-color: transparent; - background-image: url("~/.config/rofi/images/e.jpg", height); + background-image: url("./images/e.jpg", height); orientation: vertical; children: [ "inputbar", "dummy", "mode-switcher" ]; } diff --git a/files/launchers/type-6/style-6.rasi b/files/launchers/type-6/style-6.rasi index 7056c85..12c6af3 100644 --- a/files/launchers/type-6/style-6.rasi +++ b/files/launchers/type-6/style-6.rasi @@ -60,7 +60,7 @@ mainbox { imagebox { padding: 20px; background-color: transparent; - background-image: url("~/.config/rofi/images/f.png", height); + background-image: url("./images/f.png", height); orientation: vertical; children: [ "inputbar", "dummy", "mode-switcher" ]; } diff --git a/files/launchers/type-6/style-7.rasi b/files/launchers/type-6/style-7.rasi index 77eed40..37f738b 100644 --- a/files/launchers/type-6/style-7.rasi +++ b/files/launchers/type-6/style-7.rasi @@ -60,7 +60,7 @@ mainbox { imagebox { padding: 20px; background-color: transparent; - background-image: url("~/.config/rofi/images/g.png", height); + background-image: url("./images/g.png", height); orientation: vertical; children: [ "inputbar", "dummy", "mode-switcher" ]; } diff --git a/files/launchers/type-6/style-8.rasi b/files/launchers/type-6/style-8.rasi index 235dad7..c3b66f8 100644 --- a/files/launchers/type-6/style-8.rasi +++ b/files/launchers/type-6/style-8.rasi @@ -60,7 +60,7 @@ mainbox { imagebox { padding: 20px; background-color: transparent; - background-image: url("~/.config/rofi/images/h.jpg", height); + background-image: url("./images/h.jpg", height); orientation: vertical; children: [ "inputbar", "dummy", "mode-switcher" ]; } diff --git a/files/launchers/type-6/style-9.rasi b/files/launchers/type-6/style-9.rasi index e30583f..63c6723 100644 --- a/files/launchers/type-6/style-9.rasi +++ b/files/launchers/type-6/style-9.rasi @@ -60,7 +60,7 @@ mainbox { imagebox { padding: 20px; background-color: transparent; - background-image: url("~/.config/rofi/images/i.jpg", height); + background-image: url("./images/i.jpg", height); orientation: vertical; children: [ "inputbar", "dummy", "mode-switcher" ]; } diff --git a/files/launchers/type-7/launcher.sh b/files/launchers/type-7/launcher.sh index 9f950ea..85e3579 100755 --- a/files/launchers/type-7/launcher.sh +++ b/files/launchers/type-7/launcher.sh @@ -10,22 +10,15 @@ ## style-1 style-2 style-3 style-4 style-5 ## style-6 style-7 style-8 style-9 style-10 INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-1' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..10]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi -fi +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '10' "$INPUT_THEME") +if [ $? -ne 0 ]; then + echo $theme + exit 1 +fi ## Run rofi \ -show drun \ - -theme ${dir}/${theme}.rasi + -theme $theme diff --git a/files/launchers/type-7/style-1.rasi b/files/launchers/type-7/style-1.rasi index 092f4f8..04ea889 100644 --- a/files/launchers/type-7/style-1.rasi +++ b/files/launchers/type-7/style-1.rasi @@ -71,7 +71,7 @@ inputbar { spacing: 10px; padding: 80px 60px; background-color: transparent; - background-image: url("~/.config/rofi/images/a.png", width); + background-image: url("./images/a.png", width); text-color: @foreground; orientation: horizontal; children: [ "textbox-prompt-colon", "entry", "dummy", "mode-switcher" ]; diff --git a/files/launchers/type-7/style-10.rasi b/files/launchers/type-7/style-10.rasi index 124df89..f09c18e 100644 --- a/files/launchers/type-7/style-10.rasi +++ b/files/launchers/type-7/style-10.rasi @@ -71,7 +71,7 @@ inputbar { spacing: 0px; padding: 100px 40px; background-color: transparent; - background-image: url("~/.config/rofi/images/j.jpg", width); + background-image: url("./images/j.jpg", width); text-color: @foreground; orientation: horizontal; children: [ "textbox-prompt-colon", "entry" ]; diff --git a/files/launchers/type-7/style-2.rasi b/files/launchers/type-7/style-2.rasi index 40a2375..b07afc9 100644 --- a/files/launchers/type-7/style-2.rasi +++ b/files/launchers/type-7/style-2.rasi @@ -71,7 +71,7 @@ inputbar { spacing: 10px; padding: 80px 60px; background-color: transparent; - background-image: url("~/.config/rofi/images/b.png", width); + background-image: url("./images/b.png", width); text-color: @foreground; orientation: horizontal; children: [ "textbox-prompt-colon", "entry", "dummy", "mode-switcher" ]; diff --git a/files/launchers/type-7/style-3.rasi b/files/launchers/type-7/style-3.rasi index 6ac4900..27e666f 100644 --- a/files/launchers/type-7/style-3.rasi +++ b/files/launchers/type-7/style-3.rasi @@ -71,7 +71,7 @@ inputbar { spacing: 10px; padding: 100px 60px; background-color: transparent; - background-image: url("~/.config/rofi/images/c.png", width); + background-image: url("./images/c.png", width); text-color: @foreground; orientation: horizontal; children: [ "textbox-prompt-colon", "entry", "dummy", "mode-switcher" ]; diff --git a/files/launchers/type-7/style-4.rasi b/files/launchers/type-7/style-4.rasi index 9657878..b9b67a7 100644 --- a/files/launchers/type-7/style-4.rasi +++ b/files/launchers/type-7/style-4.rasi @@ -72,7 +72,7 @@ inputbar { spacing: 10px; padding: 40px 40px 155px; background-color: transparent; - background-image: url("~/.config/rofi/images/d.png", width); + background-image: url("./images/d.png", width); text-color: @foreground; orientation: horizontal; children: [ "textbox-prompt-colon", "entry" ]; diff --git a/files/launchers/type-7/style-5.rasi b/files/launchers/type-7/style-5.rasi index 0edb39d..c8fa22b 100644 --- a/files/launchers/type-7/style-5.rasi +++ b/files/launchers/type-7/style-5.rasi @@ -71,7 +71,7 @@ inputbar { spacing: 10px; padding: 80px 60px; background-color: transparent; - background-image: url("~/.config/rofi/images/e.jpg", width); + background-image: url("./images/e.jpg", width); text-color: @foreground; orientation: horizontal; children: [ "textbox-prompt-colon", "entry", "dummy", "mode-switcher" ]; diff --git a/files/launchers/type-7/style-6.rasi b/files/launchers/type-7/style-6.rasi index d500569..0f96037 100644 --- a/files/launchers/type-7/style-6.rasi +++ b/files/launchers/type-7/style-6.rasi @@ -71,7 +71,7 @@ inputbar { spacing: 10px; padding: 100px 60px; background-color: transparent; - background-image: url("~/.config/rofi/images/f.png", width); + background-image: url("./images/f.png", width); text-color: @foreground; orientation: horizontal; children: [ "textbox-prompt-colon", "entry", "dummy", "mode-switcher" ]; diff --git a/files/launchers/type-7/style-7.rasi b/files/launchers/type-7/style-7.rasi index 98d135b..11dfbe4 100644 --- a/files/launchers/type-7/style-7.rasi +++ b/files/launchers/type-7/style-7.rasi @@ -71,7 +71,7 @@ inputbar { spacing: 10px; padding: 100px 40px; background-color: transparent; - background-image: url("~/.config/rofi/images/g.png", width); + background-image: url("./images/g.png", width); text-color: @foreground; orientation: horizontal; children: [ "textbox-prompt-colon", "entry" ]; diff --git a/files/launchers/type-7/style-8.rasi b/files/launchers/type-7/style-8.rasi index 0ed4797..c9a41a8 100644 --- a/files/launchers/type-7/style-8.rasi +++ b/files/launchers/type-7/style-8.rasi @@ -71,7 +71,7 @@ inputbar { spacing: 10px; padding: 100px 60px; background-color: transparent; - background-image: url("~/.config/rofi/images/h.jpg", width); + background-image: url("./images/h.jpg", width); text-color: @foreground; orientation: horizontal; children: [ "textbox-prompt-colon", "entry", "dummy", "mode-switcher" ]; diff --git a/files/launchers/type-7/style-9.rasi b/files/launchers/type-7/style-9.rasi index ff3bf0a..aa26f5f 100644 --- a/files/launchers/type-7/style-9.rasi +++ b/files/launchers/type-7/style-9.rasi @@ -71,7 +71,7 @@ inputbar { spacing: 10px; padding: 80px 60px; background-color: transparent; - background-image: url("~/.config/rofi/images/i.jpg", width); + background-image: url("./images/i.jpg", width); text-color: @foreground; orientation: horizontal; children: [ "textbox-prompt-colon", "entry", "dummy", "mode-switcher" ]; diff --git a/files/powermenu/type-1/powermenu.sh b/files/powermenu/type-1/powermenu.sh index e62eca7..69992cb 100755 --- a/files/powermenu/type-1/powermenu.sh +++ b/files/powermenu/type-1/powermenu.sh @@ -9,25 +9,17 @@ # ## style-1 style-2 style-3 style-4 style-5 -# Current Theme INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-1' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..5]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '5' "$INPUT_THEME") + +if [ $? -ne 0 ]; then + echo $theme + exit 1 fi - # CMDs -uptime=$($dir/../../shared/uptime.sh) +uptime=$($SCRIPT_DIR/../../shared/uptime.sh) host=`hostname` # Options @@ -44,7 +36,7 @@ rofi_cmd() { rofi -dmenu \ -p "$host" \ -mesg "Uptime: $uptime" \ - -theme ${dir}/${theme}.rasi + -theme $theme } # Confirmation CMD @@ -57,7 +49,7 @@ confirm_cmd() { -dmenu \ -p 'Confirmation' \ -mesg 'Are you Sure?' \ - -theme ${dir}/${theme}.rasi + -theme $theme } # Ask for confirmation diff --git a/files/powermenu/type-2/powermenu.sh b/files/powermenu/type-2/powermenu.sh index e9d29b9..53e4f1c 100755 --- a/files/powermenu/type-2/powermenu.sh +++ b/files/powermenu/type-2/powermenu.sh @@ -10,25 +10,17 @@ ## style-1 style-2 style-3 style-4 style-5 ## style-6 style-7 style-8 style-9 style-10 -# Current Theme INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-1' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..10]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '10' "$INPUT_THEME") + +if [ $? -ne 0 ]; then + echo $theme + exit 1 fi - # CMDs -uptime=$($dir/../../shared/uptime.sh) +uptime=$($SCRIPT_DIR/../../shared/uptime.sh) host=`hostname` # Options @@ -45,7 +37,7 @@ rofi_cmd() { rofi -dmenu \ -p "Uptime: $uptime" \ -mesg "Uptime: $uptime" \ - -theme ${dir}/${theme}.rasi + -theme $theme } # Confirmation CMD @@ -58,7 +50,7 @@ confirm_cmd() { -dmenu \ -p 'Confirmation' \ -mesg 'Are you Sure?' \ - -theme ${dir}/${theme}.rasi + -theme $theme } # Ask for confirmation diff --git a/files/powermenu/type-3/powermenu.sh b/files/powermenu/type-3/powermenu.sh index b743492..f58d484 100755 --- a/files/powermenu/type-3/powermenu.sh +++ b/files/powermenu/type-3/powermenu.sh @@ -9,25 +9,18 @@ # ## style-1 style-2 style-3 style-4 style-5 -# Current Theme INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-1' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..10]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '5' "$INPUT_THEME") + +if [ $? -ne 0 ]; then + echo $theme + exit 1 fi # CMDs -uptime=$($dir/../../shared/uptime.sh) +uptime=$($SCRIPT_DIR/../../shared/uptime.sh) host=`hostname` # Options @@ -44,7 +37,7 @@ rofi_cmd() { rofi -dmenu \ -p "Uptime: $uptime" \ -mesg "Uptime: $uptime" \ - -theme ${dir}/${theme}.rasi + -theme $theme } # Confirmation CMD @@ -52,7 +45,7 @@ confirm_cmd() { rofi -dmenu \ -p 'Confirmation' \ -mesg 'Are you Sure?' \ - -theme ${dir}/shared/confirm.rasi + -theme ${SCRIPT_DIR}/shared/confirm.rasi } # Ask for confirmation diff --git a/files/powermenu/type-4/powermenu.sh b/files/powermenu/type-4/powermenu.sh index 96ca18d..16a6aa0 100755 --- a/files/powermenu/type-4/powermenu.sh +++ b/files/powermenu/type-4/powermenu.sh @@ -9,25 +9,19 @@ # ## style-1 style-2 style-3 style-4 style-5 -# Current Theme + INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-5' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..5]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '5' '5' "$INPUT_THEME") + +if [ $? -ne 0 ]; then + echo $theme + exit 1 fi # CMDs -uptime=$($dir/../../shared/uptime.sh) +uptime=$($SCRIPT_DIR/../../shared/uptime.sh) host=`hostname` # Options @@ -44,7 +38,7 @@ rofi_cmd() { rofi -dmenu \ -p "Goodbye ${USER}" \ -mesg "Uptime: $uptime" \ - -theme ${dir}/${theme}.rasi + -theme $theme } # Confirmation CMD @@ -52,7 +46,7 @@ confirm_cmd() { rofi -dmenu \ -p 'Confirmation' \ -mesg 'Are you Sure?' \ - -theme ${dir}/shared/confirm.rasi + -theme ${SCRIPT_DIR}/shared/confirm.rasi } # Ask for confirmation diff --git a/files/powermenu/type-4/style-5.rasi b/files/powermenu/type-4/style-5.rasi index 96b483c..a630933 100644 --- a/files/powermenu/type-4/style-5.rasi +++ b/files/powermenu/type-4/style-5.rasi @@ -83,7 +83,7 @@ userimage { border-radius: 100%; border-color: white; background-color: transparent; - background-image: url("~/.config/rofi/images/user.jpeg", both); + background-image: url("./images/user.jpeg", both); } /*****----- Inputbar -----*****/ diff --git a/files/powermenu/type-5/powermenu.sh b/files/powermenu/type-5/powermenu.sh index 169dcd4..e6e3e34 100755 --- a/files/powermenu/type-5/powermenu.sh +++ b/files/powermenu/type-5/powermenu.sh @@ -9,26 +9,19 @@ # ## style-1 style-2 style-3 style-4 style-5 -# Current Theme INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-1' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..5]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '5' "$INPUT_THEME") + +if [ $? -ne 0 ]; then + echo $theme + exit 1 fi # CMDs lastlogin="`last $USER | head -n1 | tr -s ' ' | cut -d' ' -f5,6,7`" -uptime=$($dir/../../shared/uptime.sh) +uptime=$($SCRIPT_DIR/../../shared/uptime.sh) host=`hostname` # Options @@ -46,7 +39,7 @@ rofi_cmd() { rofi -dmenu \ -p " $USER@$host" \ -mesg " Last Login: $lastlogin |  Uptime: $uptime" \ - -theme ${dir}/${theme}.rasi + -theme $theme } # Confirmation CMD @@ -59,7 +52,7 @@ confirm_cmd() { -dmenu \ -p 'Confirmation' \ -mesg 'Are you Sure?' \ - -theme ${dir}/${theme}.rasi + -theme $theme } # Ask for confirmation diff --git a/files/powermenu/type-5/style-1.rasi b/files/powermenu/type-5/style-1.rasi index ed3633c..71bc03f 100644 --- a/files/powermenu/type-5/style-1.rasi +++ b/files/powermenu/type-5/style-1.rasi @@ -64,7 +64,7 @@ inputbar { spacing: 0px; padding: 100px 80px; background-color: transparent; - background-image: url("~/.config/rofi/images/a.png", width); + background-image: url("./images/a.png", width); children: [ "textbox-prompt-colon", "dummy","prompt"]; } diff --git a/files/powermenu/type-5/style-2.rasi b/files/powermenu/type-5/style-2.rasi index ae737ca..4320034 100644 --- a/files/powermenu/type-5/style-2.rasi +++ b/files/powermenu/type-5/style-2.rasi @@ -64,7 +64,7 @@ inputbar { spacing: 0px; padding: 100px 80px; background-color: transparent; - background-image: url("~/.config/rofi/images/d.png", width); + background-image: url("./images/d.png", width); children: [ "textbox-prompt-colon", "dummy","prompt"]; } diff --git a/files/powermenu/type-5/style-3.rasi b/files/powermenu/type-5/style-3.rasi index 6f80ee1..4b4efc6 100644 --- a/files/powermenu/type-5/style-3.rasi +++ b/files/powermenu/type-5/style-3.rasi @@ -64,7 +64,7 @@ inputbar { spacing: 0px; padding: 100px 40px; background-color: transparent; - background-image: url("~/.config/rofi/images/e.jpg", width); + background-image: url("./images/e.jpg", width); children: [ "textbox-prompt-colon", "dummy","prompt"]; } diff --git a/files/powermenu/type-5/style-4.rasi b/files/powermenu/type-5/style-4.rasi index 247693a..9d5af97 100644 --- a/files/powermenu/type-5/style-4.rasi +++ b/files/powermenu/type-5/style-4.rasi @@ -64,7 +64,7 @@ inputbar { spacing: 0px; padding: 150px 40px; background-color: transparent; - background-image: url("~/.config/rofi/images/i.jpg", width); + background-image: url("./images/i.jpg", width); children: [ "textbox-prompt-colon", "dummy","prompt"]; } diff --git a/files/powermenu/type-5/style-5.rasi b/files/powermenu/type-5/style-5.rasi index 4492512..266f888 100644 --- a/files/powermenu/type-5/style-5.rasi +++ b/files/powermenu/type-5/style-5.rasi @@ -64,7 +64,7 @@ inputbar { spacing: 20px; padding: 100px 40px; background-color: transparent; - background-image: url("~/.config/rofi/images/j.jpg", width); + background-image: url("./images/j.jpg", width); children: [ "textbox-prompt-colon", "prompt"]; } diff --git a/files/powermenu/type-6/powermenu.sh b/files/powermenu/type-6/powermenu.sh index 374c5a8..0a952b4 100755 --- a/files/powermenu/type-6/powermenu.sh +++ b/files/powermenu/type-6/powermenu.sh @@ -9,26 +9,18 @@ # ## style-1 style-2 style-3 style-4 style-5 -# Current Theme INPUT_THEME=$1 -dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" -if [ -z $INPUT_THEME ]; then - theme='style-1' -elif [[ $1 == "-h" || $1 == "--help" ]]; then - echo "Usage: $0 [style-1..5]" - exit 0 -else - theme=$INPUT_THEME - if [ ! -d ${dir}/$theme.rasi ]; then - echo "Theme not found!" - exit 1 - fi -fi +SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" +theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '5' "$INPUT_THEME") +if [ $? -ne 0 ]; then + echo $theme + exit 1 +fi # CMDs lastlogin="`last $USER | head -n1 | tr -s ' ' | cut -d' ' -f5,6,7`" -uptime=$($dir/../../shared/uptime.sh) +uptime=$($SCRIPT_DIR/../../shared/uptime.sh) host=`hostname` # Options @@ -46,7 +38,7 @@ rofi_cmd() { rofi -dmenu \ -p " $USER@$host" \ -mesg " Uptime: $uptime" \ - -theme ${dir}/${theme}.rasi + -theme $theme } # Confirmation CMD @@ -59,7 +51,7 @@ confirm_cmd() { -dmenu \ -p 'Confirmation' \ -mesg 'Are you Sure?' \ - -theme ${dir}/${theme}.rasi + -theme $theme } # Ask for confirmation diff --git a/files/powermenu/type-6/style-1.rasi b/files/powermenu/type-6/style-1.rasi index 2af8289..77cfef2 100644 --- a/files/powermenu/type-6/style-1.rasi +++ b/files/powermenu/type-6/style-1.rasi @@ -57,7 +57,7 @@ imagebox { spacing: 30px; padding: 30px; background-color: transparent; - background-image: url("~/.config/rofi/images/a.png", height); + background-image: url("./images/a.png", height); children: [ "inputbar", "dummy", "message" ]; } @@ -68,7 +68,7 @@ userimage { border-radius: 10px; border-color: @background-alt; background-color: transparent; - background-image: url("~/.config/rofi/images/a.png", height); + background-image: url("./images/a.png", height); } /*****----- Inputbar -----*****/ diff --git a/files/powermenu/type-6/style-2.rasi b/files/powermenu/type-6/style-2.rasi index f437590..04978ce 100644 --- a/files/powermenu/type-6/style-2.rasi +++ b/files/powermenu/type-6/style-2.rasi @@ -57,7 +57,7 @@ imagebox { spacing: 20px; padding: 20px; background-color: transparent; - background-image: url("~/.config/rofi/images/d.png", height); + background-image: url("./images/d.png", height); children: [ "inputbar", "dummy", "message" ]; } @@ -68,7 +68,7 @@ userimage { border-radius: 10px; border-color: @background-alt; background-color: transparent; - background-image: url("~/.config/rofi/images/d.png", height); + background-image: url("./images/d.png", height); } /*****----- Inputbar -----*****/ diff --git a/files/powermenu/type-6/style-3.rasi b/files/powermenu/type-6/style-3.rasi index c03a032..335bd28 100644 --- a/files/powermenu/type-6/style-3.rasi +++ b/files/powermenu/type-6/style-3.rasi @@ -57,7 +57,7 @@ imagebox { spacing: 0px; padding: 30px; background-color: transparent; - background-image: url("~/.config/rofi/images/e.jpg", width); + background-image: url("./images/e.jpg", width); children: [ "inputbar", "dummy", "message" ]; } @@ -68,7 +68,7 @@ userimage { border-radius: 10px; border-color: @background-alt; background-color: transparent; - background-image: url("~/.config/rofi/images/e.jpg", height); + background-image: url("./images/e.jpg", height); } /*****----- Inputbar -----*****/ diff --git a/files/powermenu/type-6/style-4.rasi b/files/powermenu/type-6/style-4.rasi index 89978d1..c82b723 100644 --- a/files/powermenu/type-6/style-4.rasi +++ b/files/powermenu/type-6/style-4.rasi @@ -59,7 +59,7 @@ imagebox { spacing: 0px; padding: 100px; background-color: transparent; - background-image: url("~/.config/rofi/images/i.jpg", height); + background-image: url("./images/i.jpg", height); children: [ "inputbar", "dummy", "message" ]; } @@ -70,7 +70,7 @@ userimage { border-radius: 0px; border-color: @background-alt; background-color: transparent; - background-image: url("~/.config/rofi/images/i.jpg", height); + background-image: url("./images/i.jpg", height); } /*****----- Inputbar -----*****/ diff --git a/files/powermenu/type-6/style-5.rasi b/files/powermenu/type-6/style-5.rasi index ad5525a..2bc4527 100644 --- a/files/powermenu/type-6/style-5.rasi +++ b/files/powermenu/type-6/style-5.rasi @@ -59,7 +59,7 @@ imagebox { spacing: 0px; padding: 100px; background-color: transparent; - background-image: url("~/.config/rofi/images/j.jpg", height); + background-image: url("./images/j.jpg", height); children: [ "inputbar", "dummy", "message" ]; } @@ -70,7 +70,7 @@ userimage { border-radius: 0px; border-color: @background-alt; background-color: transparent; - background-image: url("~/.config/rofi/images/j.jpg", height); + background-image: url("./images/j.jpg", height); } /*****----- Inputbar -----*****/ diff --git a/files/shared/theme.sh b/files/shared/theme.sh new file mode 100755 index 0000000..b4278f7 --- /dev/null +++ b/files/shared/theme.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +SOURCE_DIR=$1 +DEFAULT_THEME=$2 +MAX_THEME=$3 +INPUT_THEME=$4 + +if [ -z "$INPUT_THEME" ]; then + theme="$DEFAULT_THEME" +elif [[ "$INPUT_THEME" == "-h" || "$INPUT_THEME" == "--help" ]]; then + echo "Usage: $SOURCE_DIR [1..$MAX_THEME]" + exit 1 +elif [[ "$INPUT_THEME" -gt "$MAX_THEME" || "$INPUT_THEME" -lt 1 ]]; then + echo "Invalid theme number! Theme must be between 1 and $MAX_THEME" + exit 1 +else + theme="$SOURCE_DIR/style-$INPUT_THEME.rasi" + if [ ! -f "$theme" ]; then + echo "Theme not found at $theme" + exit 1 + fi +fi + +echo -n "$theme"