diff options
| author | Frederic Crozat <fcrozat@mandriva.com> | 2006-10-26 16:04:10 +0000 |
|---|---|---|
| committer | Frederic Crozat <fcrozat@mandriva.com> | 2006-10-26 16:04:10 +0000 |
| commit | 7bdda0dda74c0c2efe835ea9c791a92f0520eb3f (patch) | |
| tree | 289ebadc507bf85c6a7a0c6afae67c1da36b28ae /xinit.d | |
| parent | 53b90c6fa4afd097cb3168371315d10dd91c4edc (diff) | |
| download | common-data-7bdda0dda74c0c2efe835ea9c791a92f0520eb3f.tar common-data-7bdda0dda74c0c2efe835ea9c791a92f0520eb3f.tar.gz common-data-7bdda0dda74c0c2efe835ea9c791a92f0520eb3f.tar.bz2 common-data-7bdda0dda74c0c2efe835ea9c791a92f0520eb3f.tar.xz common-data-7bdda0dda74c0c2efe835ea9c791a92f0520eb3f.zip | |
- Fix update-menus script to not output empty line
- Re-add menu file stamp to prevent restarting update-menus for each
graphical login
Diffstat (limited to 'xinit.d')
| -rwxr-xr-x | xinit.d/menu | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/xinit.d/menu b/xinit.d/menu index 5f05376..41b8c99 100755 --- a/xinit.d/menu +++ b/xinit.d/menu @@ -26,19 +26,27 @@ fi touch $HOME/.mdk-menu-migrated fi -USER_STAMP=$HOME/.xdg-menu-updates.stamp -USER_MENU=$HOME/.local/ +USER_STAMP=$HOME/.menu-updates.stamp +SYSTEM_STAMP=/var/lib/menu/.menu-updates.stamp +MENU_DIR=$HOME/.config/menus +APPS_DIR=$HOME/.local/share/applications RETVAL=0 -if [ -d $USER_MENU -o -f $USER_STAMP ]; then - if [ ! -f $USER_STAMP ]; then +if [ \( -d "$MENU_DIR" -o -d "$APP_DIR" \) -o -f "$USER_STAMP" -a -f "$SYSTEM_STAMP" ]; then + if [ ! -f "$USER_STAMP" ]; then + RETVAL=1; + elif [ "$SYSTEM_STAMP" -nt "$USER_STAMP" ]; then + RETVAL=1; + elif [ "$MENU_DIR" -nt "$USER_STAMP" ]; then + RETVAL=1; + elif [ "$APPS_DIR" -nt "$USER_STAMP" ]; then RETVAL=1; fi if [ $RETVAL -eq 1 ]; then - echo -n "Running update-menus..." + echo "Running update-menus..." update-menus -u - echo done + echo "menu generation finished" fi fi |