diff --git a/scripts/spmenu_desktop b/scripts/spmenu_desktop old mode 100755 new mode 100644 index 66a4c8d..bd78cb3 --- a/scripts/spmenu_desktop +++ b/scripts/spmenu_desktop @@ -50,7 +50,7 @@ print_desktop_list() { # autorefreshing if [ "$AUTOREFRESH" = "true" ] && [ "$1" != "noc" ]; then - entry_c="$(find "${desktopdir[@]}" -type f -name '*.desktop' 2>/dev/null | grep -c "")" + entry_c="$(find -L "${desktopdir[@]}" -type f -name '*.desktop' 2>/dev/null | grep -c "")" [ -f "$FILEFILE" ] && cached_c="$(grep -c "" < "$FILEFILE")" || cached_c="0" printf "%s: %d\n%s: %d\n" "Cached" "$cached_c" "Entries" "$entry_c" >> "$LOGFILE" @@ -68,7 +68,7 @@ print_desktop_list() { [ "$PRINT_LOGS_STDERR" = "true" ] && printf "spmenu_run: Updating .desktop entries.\n" >> /dev/stderr icons="$(find "${icondir[@]}" -type f 2>/dev/null)" - [ -z "$entry" ] && entry="$(find "${desktopdir[@]}" -type f -name '*.desktop' 2>/dev/null)" + [ -z "$entry" ] && entry="$(find -L "${desktopdir[@]}" -type f -name '*.desktop' 2>/dev/null)" [ -z "$entry_c" ] && entry_c="$(printf "%s\n" "$entry" | grep -c "")" rm -f "$TITLEFILE" "$ICONFILE" "$DESCFILE" "$EXECFILE" "$FILEFILE" "$TERMFILE" "$DISPLAYFILE" "$ONLYFILE" "$COMMENTFILE" diff --git a/scripts/spmenu_run b/scripts/spmenu_run old mode 100755 new mode 100644 index 5c8bb2d..4289476 --- a/scripts/spmenu_run +++ b/scripts/spmenu_run @@ -60,8 +60,8 @@ RUNLAUNCHER_DESKTOP_PRETEXT="Type in keywords to search for a program.." RUNLAUNCHER_FM_PRETEXT="Type in keywords to search for a file or directory.." RUNLAUNCHER_HELP_PRETEXT="" -DESKTOP_DIR="${DESKTOP_DIR:-/usr/share/applications /usr/local/share/applications ${HOME}/.local/share/applications}" -ICON_DIR="${ICON_DIR:-/usr/share/icons/hicolor /usr/local/share/icons/hicolor ${HOME}/.local/share/icons/hicolor /usr/share/pixmaps /usr/local/share/pixmaps}" +DESKTOP_DIR="${DESKTOP_DIR:-/usr/share/applications /usr/local/share/applications ${HOME}/.local/share/applications /var/lib/flatpak/exports/share/applications ${HOME}/.local/share/flatpak/exports/share}" +ICON_DIR="${ICON_DIR:-/usr/share/icons/hicolor /usr/local/share/icons/hicolor ${HOME}/.local/share/icons/hicolor /usr/share/pixmaps /usr/local/share/pixmaps /var/lib/flatpak/exports/share/icons/hicolor}" IMAGE="${IMAGE:-true}" LOGFILE="${LOGFILE:-/tmp/spmenu_run.log}"