diff options
| author | Don Williams <don.e.williams@gmail.com> | 2026-01-11 02:50:31 -0500 |
|---|---|---|
| committer | Don Williams <don.e.williams@gmail.com> | 2026-01-11 02:50:31 -0500 |
| commit | e19fdb060b8cbaba989577a145bfe71ef82d13fa (patch) | |
| tree | d6079452ae84ea384685b00e3347120e286d9b67 /scripts | |
| parent | c01672552692a530ab3bde7716122517232c1735 (diff) | |
Fixd issues with sddm wallpaper set code
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib_prompts.sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/scripts/lib_prompts.sh b/scripts/lib_prompts.sh index 6f426b53..dcad7682 100644 --- a/scripts/lib_prompts.sh +++ b/scripts/lib_prompts.sh @@ -182,8 +182,11 @@ apply_sddm_12h_format() { local log="$2" if [ -d "$sddm_directory" ]; then echo "Editing ${SKY_BLUE}$sddm_directory${RESET} to 12H format" 2>&1 | tee -a "$log" - sudo sed -i 's|^## HourFormat=\"hh:mm AP\"|HourFormat=\"hh:mm AP\"|' "$sddm_directory/theme.conf" 2>&1 | tee -a "$log" || true - sudo sed -i 's|^HourFormat=\"HH:mm\"|## HourFormat=\"HH:mm\"|' "$sddm_directory/theme.conf" 2>&1 | tee -a "$log" || true + if ! sudo -n sed -i 's|^## HourFormat="hh:mm AP"|HourFormat="hh:mm AP"|' "$sddm_directory/theme.conf" 2>&1 | tee -a "$log"; then + echo "${WARN:-[WARN]} Skipping SDDM 12H edit (sudo password required)." 2>&1 | tee -a "$log" + return + fi + sudo -n sed -i 's|^HourFormat="HH:mm"|## HourFormat="HH:mm"|' "$sddm_directory/theme.conf" 2>&1 | tee -a "$log" || true fi } @@ -192,9 +195,12 @@ apply_sddm_12h_format_sequoia() { local log="$2" if [ -d "$sddm_directory" ]; then echo "${YELLOW}sddm sequoia_2${RESET} theme exists. Editing to 12H format" 2>&1 | tee -a "$log" - sudo sed -i 's|^clockFormat=\"HH:mm\"|## clockFormat=\"HH:mm\"|' "$sddm_directory/theme.conf" 2>&1 | tee -a "$log" || true - if ! grep -q 'clockFormat=\"hh:mm AP\"' "$sddm_directory/theme.conf"; then - sudo sed -i '/^clockFormat=/a clockFormat=\"hh:mm AP\"' "$sddm_directory/theme.conf" 2>&1 | tee -a "$log" || true + if ! sudo -n sed -i 's|^clockFormat="HH:mm"|## clockFormat="HH:mm"|' "$sddm_directory/theme.conf" 2>&1 | tee -a "$log"; then + echo "${WARN:-[WARN]} Skipping sequoia SDDM 12H edit (sudo password required)." 2>&1 | tee -a "$log" + return + fi + if ! grep -q 'clockFormat="hh:mm AP"' "$sddm_directory/theme.conf"; then + sudo -n sed -i '/^clockFormat=/a clockFormat="hh:mm AP"' "$sddm_directory/theme.conf" 2>&1 | tee -a "$log" || true fi echo "${OK} 12H format set to SDDM successfully." 2>&1 | tee -a "$log" fi |