Installer: Fail if root & -u is used at the same time.

psineur · May 31, 2011 · 88c2fbf · 88c2fbf
1 parent 1135377
commit 88c2fbf
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 5 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -2,7 +2,7 @@ cocos2d for iPhone authors
 --------------------------
 
 Lead Developer:
-	Ricardo Quesada (http://www.sapusmedia.com)
+	Ricardo Quesada (http://www.zynga.com)
 
 Developers:
 	Valentin Milea

diff --git a/LICENSE_cocos2d.txt b/LICENSE_cocos2d.txt
@@ -1,6 +1,6 @@
 cocos2d for iPhone: http://www.cocos2d-iphone.org
 
-Copyright (c) 2008-2011 - Ricardo Quesada and contributors
+Copyright (c) 2011 - Zynga Inc. and contributors
 (see each file to see the different copyright owners)
 
 

diff --git a/install-templates.sh b/install-templates.sh
@@ -50,6 +50,19 @@ if [[ ! $user_dir  && "$(id -u)" != "0" ]]; then
 exit 1
 fi
 
+# Make sure root and user_dir is not executed at the same time
+if [[ $user_dir && "$(id -u)" == "0" ]]; then
+	echo ""
+	echo "Error: Do not run this script as root with the '-u' option." 1>&2
+	echo ""
+	echo "Either use the '-u' option or run it as root, but not both options at the same time." 1>&2
+	echo ""
+	echo "RECOMMENDED WAY:" 1>&2
+	echo " $0 -u -f" 1>&2
+	echo ""
+exit 1
+fi
+
 
 copy_files(){
     SRC_DIR="${SCRIPT_DIR}/${1}"

diff --git a/templates/Xcode3_templates/cocos2d_app/LICENSE.cocos2d b/templates/Xcode3_templates/cocos2d_app/LICENSE.cocos2d
@@ -1,6 +1,6 @@
 cocos2d for iPhone: http://www.cocos2d-iphone.org
 
-Copyright (c) 2008-2010 - Ricardo Quesada and contributors
+Copyright (c) 2011 - Zynga Inc. and contributors
 (see each file to see the different copyright owners)
 
 

diff --git a/templates/Xcode3_templates/cocos2d_box2d_app/LICENSE.cocos2d b/templates/Xcode3_templates/cocos2d_box2d_app/LICENSE.cocos2d
@@ -1,6 +1,6 @@
 cocos2d for iPhone: http://www.cocos2d-iphone.org
 
-Copyright (c) 2008-2010 - Ricardo Quesada and contributors
+Copyright (c) 2011 - Zynga Inc. and contributors
 (see each file to see the different copyright owners)
 
 

diff --git a/templates/Xcode3_templates/cocos2d_chipmunk_app/LICENSE.cocos2d b/templates/Xcode3_templates/cocos2d_chipmunk_app/LICENSE.cocos2d
@@ -1,6 +1,6 @@
 cocos2d for iPhone: http://www.cocos2d-iphone.org
 
-Copyright (c) 2008-2010 - Ricardo Quesada and contributors
+Copyright (c) 2011 - Zynga Inc. and contributors
 (see each file to see the different copyright owners)