From 9d7ce4e3d083c673de9a384f3ed6c7f741f38f7d Mon Sep 17 00:00:00 2001 From: nick Date: Mon, 20 Apr 2009 20:49:57 -0500 Subject: Don't report chgrp errors if the games group doesn't exist. --- bg1/install-3cd-minimal.sh | 3 --- includes/generic-includes.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/bg1/install-3cd-minimal.sh b/bg1/install-3cd-minimal.sh index c00a469..eaef847 100755 --- a/bg1/install-3cd-minimal.sh +++ b/bg1/install-3cd-minimal.sh @@ -20,9 +20,6 @@ unshield -L x $CDMOUNT/data1.cab -d "$TARGETDIR" || die cp -R "$TARGETDIR"/minimumdata/* "$TARGETDIR" || die rm -r "$TARGETDIR"/minimumdata -#cp -R "$TARGETDIR"/recommended_music/music/* "$TARGETDIR"/music/ # not a fatal error. the directory doesn't appear to exist. -#rm -r "$TARGETDIR"/recommended_music - cp -R "$TARGETDIR"/english_sounds/sounds/* "$TARGETDIR"/sounds/ || die rm -r "$TARGETDIR"/english_sounds diff --git a/includes/generic-includes.sh b/includes/generic-includes.sh index 97926f0..07de078 100644 --- a/includes/generic-includes.sh +++ b/includes/generic-includes.sh @@ -69,7 +69,7 @@ function setperms find "$1" -type f -exec chmod 644 '{}' \; find "$1" -type f -iname '*.exe' -exec chmod 755 '{}' \; find "$1" -type f -iname '*.ini' -exec chmod 664 '{}' \; - chgrp -R games "$1" > /dev/null # fail silently if you don't use a games group. + chgrp -R games "$1" &> /dev/null if [ -d "$1"/save ]; then chmod -R g+w "$1"/save fi -- cgit v1.2.3