# HG changeset patch # User Christophe Lincoln # Date 1488124704 -3600 # Node ID 215207fd9eeb00d17307fa7ffa2fdae1502de0cb # Parent 90e556840716cdb480476e626973727f4dac9f03 Fix for invalid user diff -r 90e556840716 -r 215207fd9eeb Makefile --- a/Makefile Sun Feb 26 13:37:42 2017 +0100 +++ b/Makefile Sun Feb 26 16:58:24 2017 +0100 @@ -35,7 +35,7 @@ # Installation -install-clients: +install: install -m 0755 -d $(DESTDIR)$(PREFIX)/bin install -m 0755 -d $(DESTDIR)$(PREFIX)/lib/slitaz install -m 0755 -d $(DESTDIR)$(PREFIX)/share/applications @@ -61,9 +61,10 @@ # Uninstallation -uninstall-clients: +uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/sup rm -f $(DESTDIR)$(PREFIX)/lib/slitaz/libsup.sh + rm -f $(DESTDIR)$(PREFIX)/share/applications/sup rm -f $(DESTDIR)$(PREFIX)/share/applications/sup-*.desktop rm -rf $(DESTDIR)$(PREFIX)/share/locale/*/LC_MESSAGES/sup-client.mo diff -r 90e556840716 -r 215207fd9eeb sup --- a/sup Sun Feb 26 13:37:42 2017 +0100 +++ b/sup Sun Feb 26 16:58:24 2017 +0100 @@ -12,8 +12,8 @@ fi # Sanity check -if [ ! "/home/$USER" ]; then - gettext "Not a valid user: "; echo "id $(id -u)" && exit 1 +if ! [ -d "/home/$(id -un)" ]; then + gettext "Not a valid user:"; colorize 31 " $(id -un)" && exit 1 fi mkdir -p ${cache} ${installed}