X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2Finstaller.sh;fp=OSX%2Finstaller.sh;h=e2a155dd3dcd8235f99976df343bdc8441c0e3da;hp=44e7f9bdebbf0b0c0b421b372c5297a36bb1be0e;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=2762a7d7cf8d83e68b8f635941f6609119d630ae

diff --git a/OSX/installer.sh b/OSX/installer.sh
index 44e7f9bd..e2a155dd 100755
--- a/OSX/installer.sh
+++ b/OSX/installer.sh
@@ -37,6 +37,7 @@ SRC=`dirname "$PACKAGE_PATH"`/"Screen Savers"
 DST1="$DSTVOLUME/Library/Screen Savers"
 DST2="$DSTVOLUME/Applications"
 PU="$DSTVOLUME/$HOME/Library/Screen Savers"
+UPDATER="XScreenSaverUpdater.app"
 
 function error() {
   echo "Error: $@" >&2
@@ -66,12 +67,13 @@ mkdir -p "$DST1" || error "Unable to create directory $DST1/"
 mkdir -p "$DST2" || error "Unable to create directory $DST2/"
 
 # Install the savers in /System/Library/Screen Savers/
+# Plus the updater.
 #
-for f in *.saver ; do
+for f in *.saver "$UPDATER" ; do
   DD="$DST1/$f"
   echo "Installing $DD" >&2
   rm -rf "$DD" || error "Unable to delete $DD"
-  cp -pr "$f" "$DST1/" || error "Unable to install $f in $DST1/"
+  cp -pR "$f" "$DST1/" || error "Unable to install $f in $DST1/"
   xattr -r -d com.apple.quarantine "$DD"
 
   # If this saver is also installed in the per-user directory,
@@ -84,13 +86,16 @@ done
 
 
 # Install the apps in /Applications/
+# But not the updater.
 #
 for f in *.app ; do
-  DD="$DST2/$f"
-  echo "Installing $DD" >&2
-  rm -rf "$DD" || error "Unable to delete $DD"
-  cp -pr "$f" "$DST2/" || error "Unable to install $f in $DST2/"
-  xattr -r -d com.apple.quarantine "$DD"
+  if [ "$f" != "$UPDATER" ]; then
+    DD="$DST2/$f"
+    echo "Installing $DD" >&2
+    rm -rf "$DD" || error "Unable to delete $DD"
+    cp -pR "$f" "$DST2/" || error "Unable to install $f in $DST2/"
+    xattr -r -d com.apple.quarantine "$DD"
+  fi
 done
 
 # Launch System Preferences with the Screen Saver pane selected.