fetch upstream

ios/application/NIC/control

@@ -1,4 +1,4 @@
-name "iphone/application_modern"
+name "iphone/application"
 constrain "control" to package
 constrain "theos" to link_theos
 prompt CLASSPREFIX "Class name prefix (two or more characters)" "XX"

ios/control_center_module-11up/NIC/control

@@ -1 +1,3 @@
 name "iphone/control_center_module-11up"
+constrain "control" to package
+constrain "theos" to link_theos

ios/theme/NIC/control

@@ -1,3 +1,3 @@
 name "iphone/theme"
-constrain file "control" to package
+constrain "control" to package
 constrain "theos" to link_theos

test.sh

@@ -2,16 +2,24 @@
 
 ./build.sh
 
+if [[ -d build ]]; then
+	rm -r build
+fi
+
 mkdir -p build
 pushd build &> /dev/null
 
 # For each NIC template
 for n in ../*.nic.tar; do
 	nicname=$(basename $n .nic.tar)
-	projname=${nicname#*_}"_example"
+	projname=${nicname#*_}
+	# Pkg names can't have anything other than alphanum and -+.
+	# Class names can't have anything other than alphanum
+	# So strip all but alphanum so projects that pull the project name compile
+	valid_projname=${projname//[^[:alnum:]]/}
 	# Initialize a project (and accept defaults for special fields)
-	echo | $THEOS/bin/nic.pl -p $nicname -n $projname -u X --nic $n
-	pushd ${projname/"-"/""} &> /dev/null
+	yes | $THEOS/bin/nic.pl -p $nicname -n $valid_projname -u X --nic $n
+	pushd $valid_projname &> /dev/null
 	# Build the project
 	make all
 	popd &> /dev/null