Merge branch 'pr789'

11 years ago · dbef129ffb
3 changed files with 7 additions and 1 deletions
--- a/osx/makedist.sh
+++ b/osx/makedist.sh
@ -10,7 +10,7 @@ echo "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>
				@@ -10,7 +10,7 @@ echo "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\"?>
    <license file=\"$PWD/gplv3.rtf\"/>
    <welcome file=\"$PWD/welcome.txt\"/>
    <domains enable_currentUserHome=\"true\" enable_localSystem=\"false\" enable_anywhere=\"false\"/>
-    <options customize=\"never\" require-scripts=\"false\"/>
+    <options customize=\"never\" require-scripts=\"true\"/>
    <choices-outline>
        <line choice=\"default\">
            <line choice=\"im.tox.qtox\"/>
--- a/osx/postinstall
+++ b/osx/postinstall
@ -0,0 +1,3 @@
				@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rm -rf ~/Library/Preferences/tox/update
--- a/osx/preinstall
+++ b/osx/preinstall
@ -0,0 +1,3 @@
				@@ -0,0 +1,3 @@
+#!/bin/sh
+
+killall qtox