Merge pull request #173 from lots0logs/master

update testing script

scripts/testing.sh

@@ -18,8 +18,6 @@ if ! [ -f "${previous}" ]; then
 	else
 		pacman -Sy git grub os-prober f2fs-tools --noconfirm --needed;
 	fi
-	# Test different font, GNOME default is :-/
-	su -c "gsettings set org.gnome.desktop.interface font-name 'Lato'" antergos
 	# Enable kernel modules and other services
 	if [[ "${vbox_chk}" == "VirtualBox" ]] && [ -d "${uefi}" ]; then
 		echo "VirtualBox detected. Checking kernel modules and starting services."
@@ -41,30 +39,21 @@ if ! [ -f "${previous}" ]; then
 		git clone https://github.com/Antergos/Cnchi.git cnchi;
 	fi
 	cd /usr/share/cnchi
-	echo "Switching to testing branch..."
-	git checkout testing;
+
 else
 	echo "Previous testing setup detected, skipping downloads"
 	# Check for changes on github since last time script was executed
 	# Update Cnchi with latest testing code
-	echo "Removing existing Cnchi..."
-	rm -R /usr/share/cnchi;
-	cd /usr/share;
 	echo "Getting latest version of Cnchi from testing branch..."
 	# Check commandline arguments to choose repo
-	if [ "$1" = "-d" ] || [ "$1" = "--dev-repo" ]; then
-		git clone https://github.com/"$2"/Cnchi.git cnchi;
-	else
-		git clone https://github.com/Antergos/Cnchi.git cnchi;
-	fi
 	cd /usr/share/cnchi
-	echo "Switching to testing branch..."
-	git checkout testing;
+	git pull origin master;
 fi
 
 # Start Cnchi with appropriate options
 echo "Starting Cnchi..."
 # Are we using an alternate PKG cache?
+# TODO Remove this nonsense and use proper command argument processing
 if [ "$1" != "-d" ] && [ "$1" != "--dev-repo" ] && [ "$1" != "" ]; then
     if [ "$1" = "-c" ] || [ "$1" = "--cache" ]; then
         if [ "$2" != "" ]; then
@@ -83,4 +72,4 @@ else
     cnchi -d -v -p /usr/share/cnchi/data/packages.xml & exit 0;
 fi
 
-exit 1;
+exit 1;