storm/I38
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug with keeping existing waytray configuration.

Browse Source
This commit is contained in:
Storm Dragon
2025-12-06 04:34:12 -05:00
parent 0e2d9ca736
commit 9d0994c430
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
i38.sh
View File

@@ -404,7 +404,7 @@ update_scripts() {
write_waytray_config() { write_waytray_config() {
# Only create config if waytray binaries are detected # Only create config if waytray binaries are detected
if ! command -v waytray-daemon &> /dev/null || ! command -v waytray &> /dev/null ; then if ! command -v waytray-daemon &> /dev/null || ! command -v waytray &> /dev/null ; then
return 1 return 0
fi fi
local waytrayConfigDir="${XDG_CONFIG_HOME:-$HOME/.config}/waytray" local waytrayConfigDir="${XDG_CONFIG_HOME:-$HOME/.config}/waytray"
@@ -586,7 +586,7 @@ fi
export fileBrowser="$(command -v $fileBrowser)" export fileBrowser="$(command -v $fileBrowser)"
# IRC client # IRC client
unset programList unset programList
for i in albikirc Albikirc access-irc stormirc ; do for i in albikirc Albikirc access-irc ; do
if command -v ${i/#-/} &> /dev/null ; then if command -v ${i/#-/} &> /dev/null ; then
if [ -n "$programList" ]; then if [ -n "$programList" ]; then
programList="$programList $i" programList="$programList $i"
@@ -629,15 +629,14 @@ if [[ -d "${i3Path}" ]]; then
yesno "This will replace your existing configuration at ${i3Path}. Do you want to continue?" || exit 0 yesno "This will replace your existing configuration at ${i3Path}. Do you want to continue?" || exit 0
fi fi
# Configure waytray if available
write_waytray_config
# Create the i3 configuration directory. # Create the i3 configuration directory.
mkdir -p "${i3Path}" mkdir -p "${i3Path}"
# Move scripts into place # Move scripts into place
cp -rv scripts/ "${i3Path}/" | dialog --backtitle "I38" --progressbox "Moving scripts into place and writing config..." -1 -1 cp -rv scripts/ "${i3Path}/" | dialog --backtitle "I38" --progressbox "Moving scripts into place and writing config..." -1 -1
# Configure waytray if available
write_waytray_config
cat << EOF > ${i3Path}/config cat << EOF > ${i3Path}/config
# Generated by I38 (${0##*/}) https://git.stormux.org/storm/I38 # Generated by I38 (${0##*/}) https://git.stormux.org/storm/I38
# $(date '+%A, %B %d, %Y at %I:%M%p') # $(date '+%A, %B %d, %Y at %I:%M%p')
@@ -856,7 +855,10 @@ fi)
# Simple notes system bound to n # Simple notes system bound to n
bindsym n exec --no-startup-id ${i3Path}/scripts/notes.py, mode "default" bindsym n exec --no-startup-id ${i3Path}/scripts/notes.py, mode "default"
# Password manager bound to m
bindsym m exec --no-startup-id ${i3Path}/scripts/passmanager.py, mode "default"
$(if command -v blueman-manager &> /dev/null ; then $(if command -v blueman-manager &> /dev/null ; then
echo "# Bluetooth bound to b" echo "# Bluetooth bound to b"
echo "bindsym b exec --no-startup-id blueman-manager, mode \"default\"" echo "bindsym b exec --no-startup-id blueman-manager, mode \"default\""