New code for fix-tweaked-desktop-files
This commit is contained in:
parent
5c66881c3e
commit
1a1819cf05
|
@ -1,31 +1,29 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
pidof -sq -o %PPID -x "$(basename "$0")" && exit
|
pidof -sq -o %PPID -x "$(basename "$0")" && exit
|
||||||
data="$HOME"/.local/share/applications/tweaked-desktop-files
|
datastore="$HOME"/.local/share/desktop-file-data
|
||||||
data2="$HOME"/.local/share/applications/bakkedup-desktop-files
|
bakdir="$datastore"/backup
|
||||||
|
data="$datastore"/tweaked-desktop-files
|
||||||
|
|
||||||
|
mkdir -p "$bakdir" || { echo "failed to make directory $bakdir"; exit 1; }
|
||||||
|
|
||||||
# Directories where desktop files are stored
|
# Directories where desktop files are stored
|
||||||
user="$HOME"/.local/share/applications
|
user="$HOME"/.local/share/applications
|
||||||
flatpak_local="$HOME"/.local/share/flatpak/exports/share/applications
|
|
||||||
flatpak_global=/var/lib/flatpak/exports/share/applications
|
|
||||||
pacman_local=/usr/local/share/applications
|
|
||||||
pacman_global=/usr/share/applications
|
pacman_global=/usr/share/applications
|
||||||
|
pacman_local=/usr/local/share/applications
|
||||||
|
flatpak_global=/var/lib/flatpak/exports/share/applications
|
||||||
|
flatpak_local="$HOME"/.local/share/flatpak/exports/share/applications
|
||||||
snap=/var/lib/snapd/desktop/applications
|
snap=/var/lib/snapd/desktop/applications
|
||||||
|
|
||||||
detectfiles() {
|
detectfiles() {
|
||||||
for file in "$user"/*.desktop; do
|
for file in "$user"/*.desktop; do
|
||||||
name=$(basename "$file") || continue
|
name=$(basename "$file") || continue
|
||||||
[ -d "$file" ] || grep -xq "\(flatpak-local\|flatpak-global\|pacman-local\|pacman-global\|snap\)/$name" "$data" && continue
|
[ -d "$file" ] || grep -xq "$name" "$data" && continue
|
||||||
if [ -f "$flatpak_local/$name" ]; then
|
[ -f "$pacman_global/$name" ] ||
|
||||||
echo "flatpak-local/$name" >> "$data"
|
[ -f "$pacman_local/$name" ] ||
|
||||||
elif [ -f "$flatpak_global/$name" ]; then
|
[ -f "$flatpak_global/$name" ] ||
|
||||||
echo "flatpak-global/$name" >> "$data"
|
[ -f "$flatpak_local/$name" ] ||
|
||||||
elif [ -f "$pacman_local/$name" ]; then
|
[ -f "$snap/$name" ] &&
|
||||||
echo "pacman-local/$name" >> "$data"
|
echo "$name" >> "$data"
|
||||||
elif [ -f "$pacman_global/$name" ]; then
|
|
||||||
echo "pacman-global/$name" >> "$data"
|
|
||||||
elif [ -f "$snap/$name" ]; then
|
|
||||||
echo "snap/$name" >> "$data"
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,55 +33,42 @@ fixfiles() {
|
||||||
trap 'rm $tmp' EXIT
|
trap 'rm $tmp' EXIT
|
||||||
[ -f "$data" ] && cp "$data" "$tmp" && copied='true'
|
[ -f "$data" ] && cp "$data" "$tmp" && copied='true'
|
||||||
lineno=0
|
lineno=0
|
||||||
[ "$copied" = 'true' ] && while IFS= read -r line; do
|
[ "$copied" = 'true' ] && while IFS= read -r name; do
|
||||||
((lineno++))
|
((lineno++))
|
||||||
name=${line#*/}
|
|
||||||
file="$user/$name"
|
file="$user/$name"
|
||||||
# shellcheck disable=2015 # To disable shellcheck error here, line below is intended to work this way
|
[ -f "$file" ] || { sed -i "${lineno}d" "$tmp" && ((lineno--)) ; continue; }
|
||||||
echo "$line" | grep -xq '\(flatpak-local\|flatpak-global\|pacman-local\|pacman-global\|snap\)/.\+' && [ -f "$file" ] || { sed -i "${lineno}d" "$tmp" && ((lineno--)) ; continue; }
|
[ -f "$pacman_global/$name" ] ||
|
||||||
[ -f "$flatpak_local/$name" ] ||
|
|
||||||
[ -f "$flatpak_global/$name" ] ||
|
|
||||||
[ -f "$pacman_local/$name" ] ||
|
[ -f "$pacman_local/$name" ] ||
|
||||||
[ -f "$pacman_global/$name" ] ||
|
[ -f "$flatpak_global/$name" ] ||
|
||||||
|
[ -f "$flatpak_local/$name" ] ||
|
||||||
[ -f "$snap/$name" ] ||
|
[ -f "$snap/$name" ] ||
|
||||||
{ mv "$file" "$file.bak" && echo "$line" >> "$data2"; }
|
mv "$file" "$bakdir/$file.bak"
|
||||||
done < "$data"
|
done < "$data"
|
||||||
|
|
||||||
[ "$copied" = 'true' ] && [ "$(stat -c '%Y' "$data")" = "$lastmod" ] && sort "$tmp" | uniq > "$data"
|
[ "$copied" = 'true' ] && [ "$(stat -c '%Y' "$data")" = "$lastmod" ] && sort "$tmp" | uniq > "$data"
|
||||||
|
|
||||||
[ -n "$(sort "$data2" | uniq -d)" ] && cp "$data2" "$tmp" && sort "$tmp" | uniq > "$data2"
|
for bakfile in "$bakdir"/*.desktop.bak; do
|
||||||
|
name=$(basename "${bakfile%.bak}") || continue
|
||||||
for bakfile in "$user"/*.desktop.bak; do
|
origfile="$user/$name"
|
||||||
origfile="${bakfile%.bak}"
|
|
||||||
[ -f "$origfile" ] && continue
|
[ -f "$origfile" ] && continue
|
||||||
name=$(basename "$origfile") || continue
|
[ -f "$pacman_global/$name" ] ||
|
||||||
[ -f "$flatpak_local/$name" ] ||
|
|
||||||
[ -f "$flatpak_global/$name" ] ||
|
|
||||||
[ -f "$pacman_local/$name" ] ||
|
[ -f "$pacman_local/$name" ] ||
|
||||||
[ -f "$pacman_global/$name" ] ||
|
[ -f "$flatpak_global/$name" ] ||
|
||||||
|
[ -f "$flatpak_local/$name" ] ||
|
||||||
[ -f "$snap/$name" ] &&
|
[ -f "$snap/$name" ] &&
|
||||||
mv "$bakfile" "$origfile"
|
mv "$bakfile" "$origfile"
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
while :; do
|
existing_dirs=()
|
||||||
user_new=$(ls -ad "$user"/*.desktop 2>/dev/null)
|
for dir in "$user" "$pacman_global" "$pacman_local" "$flatpak_global" "$flatpak_local" "$snap"; do
|
||||||
flatpak_local_new=$(ls -ad "$flatpak_local"/*.desktop 2>/dev/null)
|
[ -d "$dir" ] && existing_dirs=("${existing_dirs[@]}" "$dir")
|
||||||
flatpak_global_new=$(ls -ad "$flatpak_global"/*.desktop 2>/dev/null)
|
done
|
||||||
pacman_local_new=$(ls -ad "$pacman_local"/*.desktop 2>/dev/null)
|
|
||||||
pacman_global_new=$(ls -ad "$pacman_global"/*.desktop 2>/dev/null)
|
while read -r line; do
|
||||||
snap_new=$(ls -ad "$snap"/*.desktop 2>/dev/null)
|
if [ "$line" = "$user/" ]; then
|
||||||
[ "$user_new" != "$user_old" ] && detectfiles
|
detectfiles
|
||||||
[ "$flatpak_local_new" != "$flatpak_local_old" ] ||
|
else
|
||||||
[ "$flatpak_global_new" != "$flatpak_global_old" ] ||
|
fixfiles
|
||||||
[ "$pacman_local_new" != "$pacman_local_old" ] ||
|
fi
|
||||||
[ "$pacman_global_new" != "$pacman_global_old" ] ||
|
done < <(inotifywait -qm --format '%w' --include '\.desktop$' -e 'move,move_self,create,delete,delete_self,unmount' "${existing_dirs[@]}")
|
||||||
[ "$snap_new" != "$snap_old" ] && fixfiles
|
|
||||||
user_old=$user_new
|
|
||||||
flatpak_local_old=$flatpak_local_new
|
|
||||||
flatpak_global_old=$flatpak_global_new
|
|
||||||
pacman_local_old=$pacman_local_new
|
|
||||||
pacman_global_old=$pacman_global_new
|
|
||||||
snap_old=$snap_new
|
|
||||||
sleep 5
|
|
||||||
done
|
|
Loading…
Reference in New Issue
Block a user