TROMjaro/iso-profiles-settings
3
3
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a few updates

Browse Source
This commit is contained in:
Tio TROM
2021-12-17 00:11:31 +01:00
parent 81894df3dc
commit b892f6323d
58 changed files with 425 additions and 193 deletions

92
tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/fix-tweaked-desktop-files Executable file → Normal file

@ -1,56 +1,86 @@
#!/bin/bash
pidof -sq -o %PPID -x "$(basename "$0")" && exit
data="$HOME"/.local/share/applications/tweaked-desktop-files
# Directories where desktop files are stored
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
snap=/var/lib/snapd/desktop/applications
detectfiles() {
for file in "$HOME"/.local/share/applications/*.desktop; do
[ -d "$file" ] || grep -xq "$file" "$data" && continue
for file in "$user"/*.desktop; do
name=$(basename "$file") || continue
[ -f /usr/share/applications/"$name" ] ||
ls /var/lib/flatpak/app/*/current/active/files/share/applications/"$name" >/dev/null 2>&1 ||
[ -f /var/lib/snapd/desktop/applications/"$name" ] &&
echo "$file" >> "$data"
[ -d "$file" ] || grep -xq "\(flatpak-local\|flatpak-global\|pacman-local\|pacman-global\|snap\)/$name" "$data" && continue
if [ -f "$flatpak_local/$name" ]; then
echo "flatpak-local/$name" >> "$data"
elif [ -f "$flatpak_global/$name" ]; then
echo "flatpak-global/$name" >> "$data"
elif [ -f "$pacman_local/$name" ]; then
echo "pacman-local/$name" >> "$data"
elif [ -f "$pacman_global/$name" ]; then
echo "pacman-global/$name" >> "$data"
elif [ -f "$snap/$name" ]; then
echo "snap/$name" >> "$data"
fi
done
}
fixfiles() {
lastmod=$(stat -c "%Y" "$data")
tmp="$(mktemp -u)"
tmp="$(mktemp)"
trap 'rm $tmp' EXIT
[ -f "$data" ] && cp "$data" "$tmp" && copied='true'
[ "$copied" = 'true' ] && while IFS= read -r file; do
[ -f "$file" ] || { sed -i "/^$file$/d" "$tmp" ; continue; }
name=$(basename "$file") || continue
[ -f /usr/share/applications/"$name" ] ||
ls /var/lib/flatpak/app/*/current/active/files/share/applications/"$name" >/dev/null 2>&1 ||
[ -f /var/lib/snapd/desktop/applications/"$name" ] ||
lineno=0
[ "$copied" = 'true' ] && while IFS= read -r line; do
((lineno++))
name=${line#*/}
file="$user/$name"
# shellcheck disable=2015 # To disable shellcheck error here, line below is intended to work this way
echo "$line" | grep -xq '\(flatpak-local\|flatpak-global\|pacman-local\|pacman-global\|snap\)/.\+' && [ -f "$file" ] || { sed -i "${lineno}d" "$tmp" && ((lineno--)) ; continue; }
[ -f "$flatpak_local/$name" ] ||
[ -f "$flatpak_global/$name" ] ||
[ -f "$pacman_local/$name" ] ||
[ -f "$pacman_global/$name" ] ||
[ -f "$snap/$name" ] ||
mv "$file" "$file.bak"
done < "$data"
[ "$copied" = 'true' ] && [ "$(stat -c '%Y' "$data")" = "$lastmod" ] && mv "$tmp" "$data"
[ "$copied" = 'true' ] && [ "$(stat -c '%Y' "$data")" = "$lastmod" ] && sort "$tmp" | uniq > "$data"
for bakfile in "$HOME"/.local/share/applications/*.desktop.bak; do
origfile="${bakfile/%.bak}"
for bakfile in "$user"/*.desktop.bak; do
origfile="${bakfile%.bak}"
[ -f "$origfile" ] && continue
name=$(basename "$origfile") || continue
[ -f /usr/share/applications/"$name" ] ||
ls /var/lib/flatpak/app/*/current/active/files/share/applications/"$name" >/dev/null 2>&1 ||
[ -f /var/lib/snapd/desktop/applications/"$name" ] &&
[ -f "$flatpak_local/$name" ] ||
[ -f "$flatpak_global/$name" ] ||
[ -f "$pacman_local/$name" ] ||
[ -f "$pacman_global/$name" ] ||
[ -f "$snap/$name" ] &&
mv "$bakfile" "$origfile"
done
}
pidof -q -o %PPID -x fix-tweaked-desktop-files && exit
while :; do
local_new=$(ls -ad "$HOME"/.local/share/applications/*.desktop 2>/dev/null)
pacman_new=$(ls -ad /usr/share/applications/*.desktop 2>/dev/null)
flatpak_new=$(ls -ad /var/lib/flatpak/app/*/current/active/files/share/applications/*.desktop 2>/dev/null)
snap_new=$(ls -ad /var/lib/snapd/desktop/applications/*.desktop 2>/dev/null)
[ "$local_new" != "$local_old" ] && detectfiles
[ "$pacman_new" != "$pacman_old" ] ||
[ "$flatpak_new" != "$flatpak_old" ] ||
user_new=$(ls -ad "$user"/*.desktop 2>/dev/null)
flatpak_local_new=$(ls -ad "$flatpak_local"/*.desktop 2>/dev/null)
flatpak_global_new=$(ls -ad "$flatpak_global"/*.desktop 2>/dev/null)
pacman_local_new=$(ls -ad "$pacman_local"/*.desktop 2>/dev/null)
pacman_global_new=$(ls -ad "$pacman_global"/*.desktop 2>/dev/null)
snap_new=$(ls -ad "$snap"/*.desktop 2>/dev/null)
[ "$user_new" != "$user_old" ] && detectfiles
[ "$flatpak_local_new" != "$flatpak_local_old" ] ||
[ "$flatpak_global_new" != "$flatpak_global_old" ] ||
[ "$pacman_local_new" != "$pacman_local_old" ] ||
[ "$pacman_global_new" != "$pacman_global_old" ] ||
[ "$snap_new" != "$snap_old" ] && fixfiles
local_old=$local_new
pacman_old=$pacman_new
flatpak_old=$flatpak_new
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

27
tromjaro/xfce/desktop-overlay/etc/skel/.local/bin/global_menu_toggle

@ -1,27 +0,0 @@
#! /bin/bash
FILE1=/usr/lib/vala-panel/appmenu-registrar
FILE2=/usr/lib/vala-panel/appmenu-registrar.OFF
if [ -f "$FILE1" ]; then
## Disable Global Menu
sudo -A mv "$FILE1" "$FILE2" || exit
xfconf-query -c xfce4-panel -p /plugins/plugin-3/plugins/plugin-3/compact-mode -n -t bool -s true
killall appmenu-registrar
## Reset panels and windows
xfce4-panel -r &
xfwm4 --replace &
xfce4-panel &
sleep 4 && notify-send 'Top menu DISABLED !' 'Restart your computer in order for this to work properly!'
elif [ -f "$FILE2" ]; then
## Enable Global Menu
sudo -A mv "$FILE2" "$FILE1" || exit
xfconf-query -c xfce4-panel -p /plugins/plugin-3/plugins/plugin-3/compact-mode -n -t bool -s false
## Reset panels and windows
xfce4-panel -r &
xfwm4 --replace &
xfce4-panel &
sleep 4 && notify-send 'The top menu ENABLED !' 'Restart your computer in order for this to work properly!'
else
notify-send 'ERROR: is the Global Menu installed ?'
fi