forked from speedie/spmenu
Fix loop when no .desktop entries exist
This commit is contained in:
parent
0f69bd63b1
commit
dfc6532220
|
@ -60,6 +60,8 @@ print_desktop_list() {
|
||||||
printf "%s: %d\n%s: %d\n" "Cached" "$cached_c" "Entries" "$entry_c" >> "$LOGFILE"
|
printf "%s: %d\n%s: %d\n" "Cached" "$cached_c" "Entries" "$entry_c" >> "$LOGFILE"
|
||||||
|
|
||||||
[ "$cfiles" = "true" ] && [ "$entry_c" != "$cached_c" ] && cfiles=false
|
[ "$cfiles" = "true" ] && [ "$entry_c" != "$cached_c" ] && cfiles=false
|
||||||
|
|
||||||
|
[ "$entry_c" = "0" ] && return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# print data from entries
|
# print data from entries
|
||||||
|
@ -67,7 +69,7 @@ print_desktop_list() {
|
||||||
command -v desktop_pre_caching_func > /dev/null && desktop_pre_caching_func
|
command -v desktop_pre_caching_func > /dev/null && desktop_pre_caching_func
|
||||||
printf "Writing cache files because none exist.\nTitle file: '%s'\nDescription file: '%s'\nIcon file: '%s'\nExec file: '%s'\nFile file: '%s'\nTerm file: '%s'\nDisplay file: '%s'\nOnly file: '%s'\nComment file: '%s'\n" "$TITLEFILE" "$DESCFILE" "$ICONFILE" "$EXECFILE" "$FILEFILE" "$TERMFILE" "$DISPLAYFILE" "$ONLYFILE" "$COMMENTFILE" >> "$LOGFILE"
|
printf "Writing cache files because none exist.\nTitle file: '%s'\nDescription file: '%s'\nIcon file: '%s'\nExec file: '%s'\nFile file: '%s'\nTerm file: '%s'\nDisplay file: '%s'\nOnly file: '%s'\nComment file: '%s'\n" "$TITLEFILE" "$DESCFILE" "$ICONFILE" "$EXECFILE" "$FILEFILE" "$TERMFILE" "$DISPLAYFILE" "$ONLYFILE" "$COMMENTFILE" >> "$LOGFILE"
|
||||||
|
|
||||||
[ "$PRINT_LOGS_STDERR" = "true" ] && printf "spmenu_run: Updating .desktop entries.\n" >> /dev/stderr
|
[ "$PRINT_LOGS_STDERR" = "true" ] && printf "spmenu_run: Updating .desktop entries.\n" >> /dev/stderr
|
||||||
|
|
||||||
icons="$(find "${icondir[@]}" -type f 2>/dev/null)"
|
icons="$(find "${icondir[@]}" -type f 2>/dev/null)"
|
||||||
[ -z "$entry" ] && entry="$(find "${desktopdir[@]}" -type f -name '*.desktop' 2>/dev/null)"
|
[ -z "$entry" ] && entry="$(find "${desktopdir[@]}" -type f -name '*.desktop' 2>/dev/null)"
|
||||||
|
|
|
@ -59,8 +59,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_FM_PRETEXT="Type in keywords to search for a file or directory.."
|
||||||
RUNLAUNCHER_HELP_PRETEXT=""
|
RUNLAUNCHER_HELP_PRETEXT=""
|
||||||
|
|
||||||
DESKTOP_DIR="${DESKTOP_DIR:-${DESTDIR}${PREFIX}/share/applications ${HOME}/.local/share/applications}"
|
DESKTOP_DIR="${DESKTOP_DIR:-/usr/share/applications /usr/local/share/applications ${HOME}/.local/share/applications}"
|
||||||
ICON_DIR="${ICON_DIR:-${DESTDIR}${PREFIX}/share/icons/hicolor ${HOME}/.local/share/icons/hicolor ${DESTDIR}${PREFIX}/share/pixmaps}"
|
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}"
|
||||||
IMAGE="${IMAGE:-true}"
|
IMAGE="${IMAGE:-true}"
|
||||||
LOGFILE="${LOGFILE:-/tmp/spmenu_run.log}"
|
LOGFILE="${LOGFILE:-/tmp/spmenu_run.log}"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue