summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornick <nick@debian.hws.edu>2009-04-20 20:49:57 -0500
committernick <nick@debian.hws.edu>2009-04-20 20:49:57 -0500
commit9d7ce4e3d083c673de9a384f3ed6c7f741f38f7d (patch)
treef5c32f8b6eb592a07a23e2bf55a710d7c933e40c
parentfe64019b96d68ef6520c5fa049d358fa8043d96b (diff)
downloadgemrb-gameinstallers-9d7ce4e3d083c673de9a384f3ed6c7f741f38f7d.tar.bz2
gemrb-gameinstallers-9d7ce4e3d083c673de9a384f3ed6c7f741f38f7d.zip
Don't report chgrp errors if the games group doesn't exist.
-rwxr-xr-xbg1/install-3cd-minimal.sh3
-rw-r--r--includes/generic-includes.sh2
2 files changed, 1 insertions, 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