if test ! -f tools/testosx; then
echo "Run this script from the top-level CUPS source directory, e.g.:"
echo ""
- echo " tools/testosx [version]"
+ echo " sudo tools/testosx [version]"
+ echo ""
+ exit 1
+fi
+
+if test `whoami` != root; then
+ echo "Run this script with sudo, e.g.:"
+ echo ""
+ echo " sudo tools/testosx [version]"
echo ""
exit 1
fi
rev=`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[a-zA-Z]*//g'`
if test $# = 0; then
- version="1.2svn-r$rev"
+ version="1.3svn-r$rev"
else
version=$1
fi
<packaging/WELCOME.rtf >$pkgdir/Resources/Welcome.rtf
cp packaging/installer.tif $pkgdir/Resources/background.tif
-cat >$pkgdir/Resources/preflight <<EOF
+if test -x /bin/launchctl; then
+ cat >$pkgdir/Resources/preflight <<EOF
+#!/bin/sh
+# Tell launchd to stop cupsd...
+if test "x`whoami`" = xroot; then
+ sudo launchctl unload /System/Library/LaunchDaemons/org.cups.cupsd.plist || exit 0
+ sudo launchctl unload /System/Library/LaunchDaemons/org.cups.cups-lpd.plist || exit 0
+fi
+killall cupsd || exit 0
+EOF
+else
+ cat >$pkgdir/Resources/preflight <<EOF
#!/bin/sh
# Stop any running cupsd processes...
killall cupsd || exit 0
EOF
+fi
+
chmod 755 $pkgdir/Resources/preflight
if test -x /bin/launchctl; then
cat >$pkgdir/Resources/postflight <<EOF
#!/bin/sh
-# Remove old startup item, we use launchd now...
-rm -f /System/Library/StartupItems/PrintingServices/PrintingServices
+# Remove old xinetd config file, we use launchd now...
+rm -f /etc/xinetd.d/cups-lpd
# Tell launchd to reload cupsd...
-launchctl unload /System/Library/LaunchDaemons/org.cups.cupsd.plist || exit 0
-launchctl load /System/Library/LaunchDaemons/org.cups.cupsd.plist
+if test "x`whoami`" = xroot; then
+ sudo launchctl load /System/Library/LaunchDaemons/org.cups.cupsd.plist
+ sudo launchctl load /System/Library/LaunchDaemons/org.cups.cupsd-lpd.plist || exit 0
+fi
EOF
else
cat >$pkgdir/Resources/postflight <<EOF
chmod 755 $pkgdir/Resources/postflight
+case `uname -r` in
+ 8.* | 9.*)
+ cp packaging/InstallationCheck $pkgdir/Resources
+ chmod 755 $pkgdir/Resources/InstallationCheck
+ ;;
+esac
+
# Tag the current revision in the plist and web interface files...
for file in packaging/cups-desc.plist packaging/cups-info.plist \
doc/index.html doc/ja/index.html templates/header.tmpl; do
echo Updating $file...
sed -e '1,$s/@CUPS_VERSION@/'$version'/g' \
-e '1,$s/@CUPS_REVISION@//g' \
- -e '1,$s/@CUPS_RELEASE@/1.2.'$rev'/g' \
+ -e '1,$s/@CUPS_RELEASE@/1.3.'$rev'/g' \
<$file.in >$file
done