From 9f8d81d3bef44e87d2e721f4f602f6521e246047 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 25 Feb 2025 20:50:46 +0900 Subject: updated Waybar Extra Modules to UserModules --- copy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index 3ec9dbfc..6f4bc3cc 100755 --- a/copy.sh +++ b/copy.sh @@ -596,9 +596,9 @@ if [ -d "$DIRPATHw" ]; then done || true # Step 4: restore Modules_Extras - BACKUP_FILE="$DIRPATHw-backup-$BACKUP_DIR/Modules_Extras" + BACKUP_FILE="$DIRPATHw-backup-$BACKUP_DIR/UserModules" if [ -f "$BACKUP_FILE" ]; then - cp -f "$BACKUP_FILE" "$DIRPATHw/Modules_Extras" + cp -f "$BACKUP_FILE" "$DIRPATHw/UserModules" fi break -- cgit v1.2.3 From 36d906ab8c6f246e139ab9ca910ac7ec7e51ad74 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 26 Feb 2025 12:45:32 +0900 Subject: Ok This will be my last push for v2.3.12. Basically, added a global fonts for rasi, making it easier to tweak. Added Style 14. Will start new version after this. Except of course if there is a bug that needs to be squashed --- config/hypr/UserScripts/WallpaperEffects.sh | 3 +- config/hypr/UserScripts/WallpaperSelect.sh | 2 +- config/rofi/0-shared-fonts.rasi | 16 ++ config/rofi/config-edit.rasi | 3 +- config/rofi/config.rasi | 10 +- config/rofi/themes/KooL_style-1.rasi | 4 - config/rofi/themes/KooL_style-10-Fancy-v2.rasi | 5 - config/rofi/themes/KooL_style-10-Fancy.rasi | 5 - .../rofi/themes/KooL_style-11-Win11-list-dark.rasi | 4 - .../themes/KooL_style-11-Win11-list-light.rasi | 5 - config/rofi/themes/KooL_style-12-TOP-Docu.rasi | 5 - config/rofi/themes/KooL_style-13-Vertical.rasi | 5 - config/rofi/themes/KooL_style-14.rasi | 188 +++++++++++++++++++++ config/rofi/themes/KooL_style-2-Dark.rasi | 4 - config/rofi/themes/KooL_style-2-Light.rasi | 4 - config/rofi/themes/KooL_style-3-FullScreen-v1.rasi | 5 - config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi | 4 - config/rofi/themes/KooL_style-4.rasi | 4 - config/rofi/themes/KooL_style-5.rasi | 4 - config/rofi/themes/KooL_style-6.rasi | 5 - config/rofi/themes/KooL_style-7.rasi | 4 - config/rofi/themes/KooL_style-8.rasi | 5 - config/rofi/themes/KooL_style-9.rasi | 5 - copy.sh | 40 ++--- 24 files changed, 233 insertions(+), 106 deletions(-) create mode 100644 config/rofi/0-shared-fonts.rasi create mode 100644 config/rofi/themes/KooL_style-14.rasi (limited to 'copy.sh') diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh index 5ddc9fd3..46cc4132 100755 --- a/config/hypr/UserScripts/WallpaperEffects.sh +++ b/config/hypr/UserScripts/WallpaperEffects.sh @@ -102,10 +102,11 @@ main sleep 1 + if [[ -n "$choice" ]]; then sddm_sequoia="/usr/share/sddm/themes/sequoia_2" if [ -d "$sddm_sequoia" ]; then - if yad --question --text="Set wallpaper as SDDM background?\nNOTE: This only applies to SEQUOIA SDDM Theme" --title="SDDM Background" --ok-label="Yes"; then + if yad --question --text="Set wallpaper as SDDM background?\nNOTE: This only applies to SEQUOIA SDDM Theme" --title="SDDM Background" --timeout=10 --ok-label="Yes"; then # Check if terminal exists if ! command -v "$terminal" &>/dev/null; then diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh index 272797e3..26d2dcf3 100755 --- a/config/hypr/UserScripts/WallpaperSelect.sh +++ b/config/hypr/UserScripts/WallpaperSelect.sh @@ -130,7 +130,7 @@ sleep 1 if [[ -n "$choice" ]]; then sddm_sequoia="/usr/share/sddm/themes/sequoia_2" if [ -d "$sddm_sequoia" ]; then - if yad --question --text="Set wallpaper as SDDM background?\nNOTE: This only applies to SEQUOIA SDDM Theme" --title="SDDM Background" --ok-label="Yes"; then + if yad --question --text="Set wallpaper as SDDM background?\nNOTE: This only applies to SEQUOIA SDDM Theme" --title="SDDM Background" --timeout=10 --ok-label="Yes"; then # Check if terminal exists if ! command -v "$terminal" &>/dev/null; then diff --git a/config/rofi/0-shared-fonts.rasi b/config/rofi/0-shared-fonts.rasi new file mode 100644 index 00000000..2c3997b0 --- /dev/null +++ b/config/rofi/0-shared-fonts.rasi @@ -0,0 +1,16 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ +/* Ja KooLit - Global rofi fonts */ + +/* This is where you can change fonts and sizes */ + + +/*****-- Fonts Size and Font Size -----*****/ +configuration { + font: "JetBrainsMono Nerd Font SemiBold 15"; +} + + +/*****-- Elements Font Size -----*****/ +element-text { + font: "JetBrainsMono Nerd Font SemiBold 13"; +} \ No newline at end of file diff --git a/config/rofi/config-edit.rasi b/config/rofi/config-edit.rasi index 2ed85ed1..ffa5603f 100644 --- a/config/rofi/config-edit.rasi +++ b/config/rofi/config-edit.rasi @@ -35,7 +35,8 @@ listview { /* ---- Entry input ---- */ entry { expand: true; - placeholder: " 👀 View / Edit KooL Hyprland Configs"; + placeholder: " 💫 Customize KooL Hyprland 💫"; + horizontal-align: 0.5; } diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi index 41a48540..011eebb1 100644 --- a/config/rofi/config.rasi +++ b/config/rofi/config.rasi @@ -13,12 +13,10 @@ * If you have edited a config, rename it with a unique name. During update, the contents of * ~/.config/rofi/themes/ will be replaced. */ -/* ---- Configuration Fonts ---- */ -configuration { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} - -/* note: Element-text font and size, edit configs in ~/.config/rofi/themes/ */ +/* ---- Global Configuration Fonts ---- */ +@import "~/.config/rofi/0-shared-fonts.rasi" +/* note: Main themes in ~/.config/rofi/themes */ +/* You can manually change here or you can use rofi theme selector SUPER SHIFT E */ @theme "~/.config/rofi/themes/KooL_style-9.rasi" diff --git a/config/rofi/themes/KooL_style-1.rasi b/config/rofi/themes/KooL_style-1.rasi index f2e0977e..89bb959e 100644 --- a/config/rofi/themes/KooL_style-1.rasi +++ b/config/rofi/themes/KooL_style-1.rasi @@ -32,10 +32,6 @@ configuration { border-color: @selected; } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} /* ---- Window ---- */ window { // Default diff --git a/config/rofi/themes/KooL_style-10-Fancy-v2.rasi b/config/rofi/themes/KooL_style-10-Fancy-v2.rasi index fe5afcdb..654428b4 100644 --- a/config/rofi/themes/KooL_style-10-Fancy-v2.rasi +++ b/config/rofi/themes/KooL_style-10-Fancy-v2.rasi @@ -24,11 +24,6 @@ line-style: "none"; } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} - prompt-box { background-color : transparent; } diff --git a/config/rofi/themes/KooL_style-10-Fancy.rasi b/config/rofi/themes/KooL_style-10-Fancy.rasi index 170a888e..c68b9755 100644 --- a/config/rofi/themes/KooL_style-10-Fancy.rasi +++ b/config/rofi/themes/KooL_style-10-Fancy.rasi @@ -41,11 +41,6 @@ configuration { selected-active-background: rgba ( 20, 20, 17, 100 % ); } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} - window { border-color: darkgray/30%; background-color: black/50%; diff --git a/config/rofi/themes/KooL_style-11-Win11-list-dark.rasi b/config/rofi/themes/KooL_style-11-Win11-list-dark.rasi index e65f174f..c7843812 100644 --- a/config/rofi/themes/KooL_style-11-Win11-list-dark.rasi +++ b/config/rofi/themes/KooL_style-11-Win11-list-dark.rasi @@ -31,10 +31,6 @@ configuration { spacing : 0; } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} element-icon, element-text, scrollbar { cursor: pointer; diff --git a/config/rofi/themes/KooL_style-11-Win11-list-light.rasi b/config/rofi/themes/KooL_style-11-Win11-list-light.rasi index b3979f13..b640dda2 100644 --- a/config/rofi/themes/KooL_style-11-Win11-list-light.rasi +++ b/config/rofi/themes/KooL_style-11-Win11-list-light.rasi @@ -31,11 +31,6 @@ configuration { spacing : 0; } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} - element-icon, element-text, scrollbar { cursor: pointer; } diff --git a/config/rofi/themes/KooL_style-12-TOP-Docu.rasi b/config/rofi/themes/KooL_style-12-TOP-Docu.rasi index 67c4a205..fe80019c 100644 --- a/config/rofi/themes/KooL_style-12-TOP-Docu.rasi +++ b/config/rofi/themes/KooL_style-12-TOP-Docu.rasi @@ -37,11 +37,6 @@ entry { cursor: text; } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; - -} inputbar { spacing: 0; children: [ icon-keyboard, entry, mode-switcher ]; diff --git a/config/rofi/themes/KooL_style-13-Vertical.rasi b/config/rofi/themes/KooL_style-13-Vertical.rasi index b1dc9018..1e7f8337 100644 --- a/config/rofi/themes/KooL_style-13-Vertical.rasi +++ b/config/rofi/themes/KooL_style-13-Vertical.rasi @@ -32,11 +32,6 @@ configuration { border-color: @selected; } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} - /* ---- Window ---- */ window { width: 15%; diff --git a/config/rofi/themes/KooL_style-14.rasi b/config/rofi/themes/KooL_style-14.rasi new file mode 100644 index 00000000..a766cb96 --- /dev/null +++ b/config/rofi/themes/KooL_style-14.rasi @@ -0,0 +1,188 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ +/* KooL Hyprland Rofi Style 14 */ + +/* original design from: https://github.com/adi1090x/rofi */ + +/*****----- Configuration -----*****/ +configuration { + modi: "drun"; + show-icons: true; + display-drun: "Applications"; + drun-display-format: "{name}"; +} + +/*****----- Global Properties -----*****/ +@theme "~/.config/rofi/wallust/colors-rofi.rasi" + +/*****----- Global Properties -----*****/ +* { + background-alt: @color0; + selected: @color13; + active: @color12; + urgent: #8E3596; +} + +/*****----- Main Window -----*****/ +window { + transparency: "real"; + location: center; + anchor: center; + fullscreen: false; + width: 40%; + x-offset: 0px; + y-offset: 0px; + + enabled: true; + margin: 0px; + padding: 0px; + border: 2px 0px 2px 0px; + border-radius: 16px; + border-color: @active; + background-color: @background; + cursor: "default"; +} + +/*****----- Main Box -----*****/ +mainbox { + enabled: true; + spacing: 10px; + margin: 0px; + padding: 30px; + border: 0px solid; + border-radius: 0px 0px 0px 0px; + border-color: @selected; + background-color: transparent; + children: [ "inputbar", "listview" ]; +} + +/*****----- Inputbar -----*****/ +inputbar { + enabled: true; + spacing: 0px; + margin: 0px; + padding: 0px; + border: 0px solid; + border-radius: 16px; + border-color: @selected; + background-color: @background-alt; + text-color: @foreground; + children: [ "prompt", "entry" ]; +} + +prompt { + enabled: true; + padding: 12px; + border-radius: 16px; + background-color: @active; + text-color: @background; +} +textbox-prompt-colon { + enabled: true; + expand: false; + str: "::"; + background-color: inherit; + text-color: inherit; +} +entry { + enabled: true; + padding: 12px; + background-color: inherit; + text-color: inherit; + cursor: text; + placeholder: "Search 👀 NOTE: CTRL TAB to change MODE"; + placeholder-color: inherit; +} + +/*****----- Listview -----*****/ +listview { + enabled: true; + columns: 2; + lines: 5; + cycle: true; + dynamic: true; + scrollbar: false; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: true; + + spacing: 10px; + margin: 0px; + padding: 0px; + border: 0px solid; + border-radius: 0px; + border-color: @selected; + background-color: transparent; + text-color: @foreground; + cursor: "default"; +} +scrollbar { + handle-width: 5px ; + handle-color: @selected; + border-radius: 0px; + background-color: @background-alt; +} + +/*****----- Elements -----*****/ +element { + enabled: true; + spacing: 10px; + margin: 0px; + padding: 10px; + border: 0px solid; + border-radius: 16px; + border-color: @selected; + background-color: @background; + text-color: @foreground; + cursor: pointer; +} +element normal.normal { + background-color: @background-alt; + text-color: @foreground; +} +element alternate.normal { + background-color: @background-alt; + text-color: @foreground; +} +element selected.normal { + border: 0px 5px 0px 5px; + border-radius: 16px; + border-color: @selected; + background-color: @background-alt; + text-color: @selected; +} +element-icon { + padding: 0px 0px 0px 10px; + background-color: transparent; + text-color: inherit; + size: 32px; + cursor: inherit; +} +element-text { + padding: 10px; + background-color: transparent; + text-color: inherit; + highlight: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.0; +} + +/*****----- Message -----*****/ +error-message { + padding: 15px; + border: 2px solid; + border-radius: 16px; + border-color: @selected; + background-color: @background; + text-color: @foreground; +} +textbox { + background-color: @active; + padding: 10px; + border-radius: 16px; + text-color: inherit; + vertical-align: 0.5; + horizontal-align: 0.5; + highlight: none; +} diff --git a/config/rofi/themes/KooL_style-2-Dark.rasi b/config/rofi/themes/KooL_style-2-Dark.rasi index 709a55f9..3ae384f9 100644 --- a/config/rofi/themes/KooL_style-2-Dark.rasi +++ b/config/rofi/themes/KooL_style-2-Dark.rasi @@ -22,10 +22,6 @@ configuration { * { } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} /*****----- Main Window -----*****/ window { diff --git a/config/rofi/themes/KooL_style-2-Light.rasi b/config/rofi/themes/KooL_style-2-Light.rasi index f2032071..84700655 100644 --- a/config/rofi/themes/KooL_style-2-Light.rasi +++ b/config/rofi/themes/KooL_style-2-Light.rasi @@ -22,10 +22,6 @@ configuration { * { } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} /*****----- Main Window -----*****/ window { diff --git a/config/rofi/themes/KooL_style-3-FullScreen-v1.rasi b/config/rofi/themes/KooL_style-3-FullScreen-v1.rasi index d4bc1b87..4efe106c 100644 --- a/config/rofi/themes/KooL_style-3-FullScreen-v1.rasi +++ b/config/rofi/themes/KooL_style-3-FullScreen-v1.rasi @@ -33,11 +33,6 @@ configuration { border-color: @selected; } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} - /* ---- Global Properties ---- */ * { main-bg: @background; diff --git a/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi b/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi index 902b6ccc..7e771105 100644 --- a/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi +++ b/config/rofi/themes/KooL_style-3-Fullscreen-v2.rasi @@ -55,10 +55,6 @@ configuration { } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} /*****----- Main Window -----*****/ window { diff --git a/config/rofi/themes/KooL_style-4.rasi b/config/rofi/themes/KooL_style-4.rasi index 06c04e82..7c34d61e 100644 --- a/config/rofi/themes/KooL_style-4.rasi +++ b/config/rofi/themes/KooL_style-4.rasi @@ -54,10 +54,6 @@ configuration { } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} /*****----- Main Window -----*****/ window { diff --git a/config/rofi/themes/KooL_style-5.rasi b/config/rofi/themes/KooL_style-5.rasi index 1f2aba4e..94555ebb 100644 --- a/config/rofi/themes/KooL_style-5.rasi +++ b/config/rofi/themes/KooL_style-5.rasi @@ -33,10 +33,6 @@ configuration { border-color: @selected; } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} /* ---- Window ---- */ window { diff --git a/config/rofi/themes/KooL_style-6.rasi b/config/rofi/themes/KooL_style-6.rasi index ea4705c9..c0b1eaa6 100644 --- a/config/rofi/themes/KooL_style-6.rasi +++ b/config/rofi/themes/KooL_style-6.rasi @@ -33,11 +33,6 @@ configuration { border-color: @selected; } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} - /* ---- Window ---- */ window { // Default diff --git a/config/rofi/themes/KooL_style-7.rasi b/config/rofi/themes/KooL_style-7.rasi index c6d89aeb..b1a1a9a9 100644 --- a/config/rofi/themes/KooL_style-7.rasi +++ b/config/rofi/themes/KooL_style-7.rasi @@ -28,10 +28,6 @@ configuration { active: @color11; urgent: #8E3596; } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} /*****----- Main Window -----*****/ window { diff --git a/config/rofi/themes/KooL_style-8.rasi b/config/rofi/themes/KooL_style-8.rasi index 1c4b18fa..e0ca3208 100644 --- a/config/rofi/themes/KooL_style-8.rasi +++ b/config/rofi/themes/KooL_style-8.rasi @@ -27,11 +27,6 @@ configuration { border-radius: 12px; } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} - /* ---- Window ---- */ window { width: 50%; diff --git a/config/rofi/themes/KooL_style-9.rasi b/config/rofi/themes/KooL_style-9.rasi index 23f3e367..6b1346f6 100644 --- a/config/rofi/themes/KooL_style-9.rasi +++ b/config/rofi/themes/KooL_style-9.rasi @@ -34,11 +34,6 @@ configuration { ON: #ABE9B3ff; } -/*****-- Elements Font Size -----*****/ -element-text { - font: "JetBrainsMono Nerd Font SemiBold 13"; -} - /* ---- Window ---- */ window { transparency: "real"; diff --git a/copy.sh b/copy.sh index 6f4bc3cc..a055e651 100755 --- a/copy.sh +++ b/copy.sh @@ -318,31 +318,24 @@ done # Use the selected resolution in your existing script echo "${OK} You have chosen $resolution resolution." 2>&1 | tee -a "$LOG" -# Add your commands based on the resolution choice +# actions if < 1440p is chosen if [ "$resolution" == "< 1440p" ]; then - #cp -r config/rofi/resolution/1080p/* config/rofi/ 10-Feb-2025 + # kitty font size sed -i 's/font_size 16.0/font_size 14.0/' config/kitty/kitty.conf # hyprlock matters - mv config/hypr/hyprlock.conf config/hypr/hyprlock-2k.conf && - mv config/hypr/hyprlock-1080p.conf config/hypr/hyprlock.conf + if [ -f config/hypr/hyprlock.conf ]; then + mv config/hypr/hyprlock.conf config/hypr/hyprlock-2k.conf + fi + if [ -f config/hypr/hyprlock-1080p.conf ]; then + mv config/hypr/hyprlock-1080p.conf config/hypr/hyprlock.conf + fi # rofi fonts reduction - themes_dir="config/rofi/themes" - config_file="config/rofi/config.rasi" - - # Change rofi font size - find "$themes_dir" -type f | while read -r file; do - if grep -Pzoq 'element-text {\n font: "JetBrainsMono Nerd Font SemiBold 13";\n}' "$file"; then - sed -i 's/font: "JetBrainsMono Nerd Font SemiBold 13"/font: "JetBrainsMono Nerd Font SemiBold 11"/' "$file" - fi - done - - # Change rofi font size in ~/.config/rofi/config.rasi - if [ -f "$config_file" ]; then - if grep -Pzoq 'configuration {\n font: "JetBrainsMono Nerd Font SemiBold 13";\n}' "$config_file"; then - sed -i 's/font: "JetBrainsMono Nerd Font SemiBold 13"/font: "JetBrainsMono Nerd Font SemiBold 12"/' "$config_file" - fi + rofi_config_file="config/rofi/0-shared-fonts.rasi" + if [ -f "$rofi_config_file" ]; then + sed -i '/element-text {/,/}/s/[[:space:]]*font: "JetBrainsMono Nerd Font SemiBold 13"/font: "JetBrainsMono Nerd Font SemiBold 11"/' "$rofi_config_file" 2>&1 | tee -a "$LOG" + sed -i '/configuration {/,/}/s/[[:space:]]*font: "JetBrainsMono Nerd Font SemiBold 15"/font: "JetBrainsMono Nerd Font SemiBold 13"/' "$rofi_config_file" 2>&1 | tee -a "$LOG" fi fi @@ -491,9 +484,16 @@ for DIR2 in $DIRS; do for file in "$DIRPATH-backup-$BACKUP_DIR/themes"/*; do [ -e "$file" ] || continue # Skip if no files are found echo "Copying $file to $HOME/.config/rofi/themes/" >> "$LOG" - cp -n "$file" "$HOME/.config/rofi/themes/" + cp -n "$file" "$HOME/.config/rofi/themes/" >> "$LOG" 2>&1 done || true fi + + # restoring global 0-shared-fonts.rasi + if [ -f "$DIRPATH-backup-$BACKUP_DIR/0-shared-fonts.rasi" ]; then + echo "Restoring $DIRPATH-backup-$BACKUP_DIR/0-shared-fonts.rasi to $HOME/.config/rofi/" >> "$LOG" + cp "$DIRPATH-backup-$BACKUP_DIR/0-shared-fonts.rasi" "$HOME/.config/rofi/0-shared-fonts.rasi" >> "$LOG" 2>&1 + fi + fi break -- cgit v1.2.3 From 831550b9fb619499b01f4923dfc449321e8ccb1e Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 27 Feb 2025 09:47:51 +0900 Subject: minor update copy.sh --- copy.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'copy.sh') diff --git a/copy.sh b/copy.sh index a055e651..3a24ee58 100755 --- a/copy.sh +++ b/copy.sh @@ -596,10 +596,9 @@ if [ -d "$DIRPATHw" ]; then done || true # Step 4: restore Modules_Extras - BACKUP_FILE="$DIRPATHw-backup-$BACKUP_DIR/UserModules" - if [ -f "$BACKUP_FILE" ]; then - cp -f "$BACKUP_FILE" "$DIRPATHw/UserModules" - fi + BACKUP_FILEw="$DIRPATHw-backup-$BACKUP_DIR/UserModules" + if [ -f "$BACKUP_FILEw" ]; then + cp -f "$BACKUP_FILEw" "$DIRPATHw/UserModules" break ;; -- cgit v1.2.3