Merge lp:~nik90/component-store/improve-ucs-script into lp:component-store

[Nekhelesh Ramananthan]

- Fixed typos in the help command
- Improved install and update command to use less network bandwidth

- Fixed typos in the help command
- Improved install and update command to use less network bandwidth

=== modified file 'script/debian/changelog'
--- script/debian/changelog	2014-11-08 23:03:50 +0000
+++ script/debian/changelog	2014-11-09 15:39:04 +0000
@@ -1,3 +1,11 @@
+ucs (0.1.2) trusty; urgency=medium
+
+  * Improved install and update command to use less network bandwidth by only
+    downloading the necessary components.
+  * Fixed some typos in the help command.
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Sun, 09 Nov 2014 16:36:31 +0100
+
 ucs (0.1.1) trusty; urgency=medium
 
   * Fixed install path to usr/bin

=== modified file 'script/ucs'
--- script/ucs	2014-11-08 22:37:17 +0000
+++ script/ucs	2014-11-09 15:39:04 +0000
@@ -4,6 +4,7 @@
 PWD=$(pwd)
 ARGS=("$@")
 UCS_BRANCH=lp:component-store
+UCS_FILEPATH=lp:~ubuntu-touch-community-dev/component-store/trunk.14.10/ComponentStore
 BOOTSTRAP_FOLDER=${PWD}/ComponentStoreSetup
 
 # Color Output
@@ -12,13 +13,14 @@
 NC='\e[0m'
 
 show_usage() {
-	echo "Usage: $0 [OPTION].. [OTHER ARGUMENTS]"
+	echo "Usage:"
+	echo "  ucs <command> [options]"
 	echo ""
-	echo "options:"
-	echo -e "\tinstall [COMPONENT]\tInstall Component"
-	echo -e "\tupdate [COMPONENT]\tUpdate Component"
-	echo -e "\thelp 		\tdisplay this help and exit"
-	echo -e "\tversion		\toutput version information and exit"
+	echo "Commands:"
+	echo -e "  install	\tInstall Components"
+	echo -e "  update 	\tUpdate Components"
+	echo -e "  help		\tdisplay this help and exit"
+	echo -e "  version	\toutput version information and exit"
 }
 
 install_prerequisites() {
@@ -41,59 +43,73 @@
 
 #CASE: ABOUT ARGUMENT
 elif [[ $1 == "version"  ]]; then
-	echo "Ubuntu Component Store (UCS) v0.1"
+	echo "Ubuntu Component Store (UCS) v0.1.2"
 	echo "Copyright (C) 2014 Ubuntu Touch Community Dev Team"
 	echo "License GPLv3: GNU version 3 <http://gnu.org/licenses/gpl.html>."
 	echo "This is free software: you are free to change and redistribute it."
 	echo "There is NO WARRANTY, to the extent permitted by law."
 	echo
-	echo "Written by Nekhelesh Ramananthan"
+	echo "Written by Ubuntu Touch Community Dev"
 	exit 0
 
 #CASE: INSTALL ARGUMENT
 elif [[ $1 == "install" ]]; then
 	install_prerequisites
-	echo "Grabbing the latest upstream code..."
-	bzr branch -q $UCS_BRANCH $BOOTSTRAP_FOLDER
 	if [ $# -gt 1 ]; then
 		for (( i=1; i<$#; i++ ))
 		do
-			if [ -d $BOOTSTRAP_FOLDER/ComponentStore/${ARGS[$i]} ]; then
-				echo -e "Installing ${ARGS[$i]}...${GC}DONE${NC}"
-				mv $BOOTSTRAP_FOLDER/ComponentStore/${ARGS[$i]}/* ${PWD}
+			echo -n "[$i/`expr $# - 1`] Installing ${ARGS[$i]}..."
+			componentfilelist=(`bzr ls -q $UCS_FILEPATH/${ARGS[$i]}`)
+			componentfilelistcount=${#componentfilelist[@]}
+			if (( componentfilelistcount == 0 )); then
+				echo -e "${RC}FAILED${NC} (Invalid component name)"
 			else
-				echo -e "Installing ${ARGS[$i]}...${RC}FAILED${NC} (Invalid component name)"
+				for (( j=0; j<componentfilelistcount; j++ ))
+				do
+					filename=$(basename ${componentfilelist[j]})
+					bzr cat -q ${componentfilelist[j]} > ${PWD}/${filename}
+				done
+				echo -e "${GC}DONE${NC}"
 			fi
 		done
 	else
-		echo -e "Installing all components...${GC}DONE${NC}"
-		componentlist=(`ls $BOOTSTRAP_FOLDER/ComponentStore`)
+		echo -n "Installing all components..."
+		componentlist=(`bzr ls -q $UCS_FILEPATH`)
 		componentlistcount=${#componentlist[@]}
 		for (( i=0; i<componentlistcount; i++ ))
 		do
-			mv $BOOTSTRAP_FOLDER/ComponentStore/${componentlist[i]}/* ${PWD}
+			componentfilelist=(`bzr ls -q ${componentlist[i]}`)
+			componentfilelistcount=${#componentfilelist[@]}
+			for (( j=0; j<componentfilelistcount; j++ ))
+			do
+				bzr cat -q ${componentlist[i]}${componentfilelist[j]} > ${PWD}/${componentfilelist[j]}
+			done
 		done
+		echo -e "${GC}DONE${NC}"
 	fi
-	rm -r $BOOTSTRAP_FOLDER
 	echo -e "${GC}Installation Complete!${NC}"
 
 #CASE: UPDATE ARGUMENT
 elif [[ $1 == "update" ]]; then
 	if [ $# -gt 1 ]; then
-		echo "Grabbing the latest upstream code..."
-		bzr branch -q $UCS_BRANCH $BOOTSTRAP_FOLDER
 		for (( i=1; i<$#; i++ ))
 		do
-			if [ -d $BOOTSTRAP_FOLDER/ComponentStore/${ARGS[$i]} ]; then
-				echo -e "Updating ${ARGS[$i]}...${GC}DONE${NC}"
-				mv $BOOTSTRAP_FOLDER/ComponentStore/${ARGS[$i]}/* ${PWD}
+			echo -n "[$i/`expr $# - 1`] Updating ${ARGS[$i]}..."
+			componentfilelist=(`bzr ls -q $UCS_FILEPATH/${ARGS[$i]}`)
+			componentfilelistcount=${#componentfilelist[@]}
+			if (( componentfilelistcount == 0 )); then
+				echo -e "${RC}FAILED${NC} (Invalid component name)"
 			else
-				echo -e "Updating ${ARGS[$i]}...${RC}FAILED${NC} (Invalid component name)"
+				for (( j=0; j<componentfilelistcount; j++ ))
+				do
+					filename=$(basename ${componentfilelist[j]})
+					bzr cat -q ${componentfilelist[j]} > ${PWD}/${filename}
+				done
+				echo -e "${GC}DONE${NC}"
 			fi
 		done
-		rm -r $BOOTSTRAP_FOLDER
 	echo -e "${GC}Updating Components Complete!${NC}"
 	else
-		echo -e "${RC}Error updating components! Please specify the component name you want to update. Eg. ./ucs update EmptyState${NC}"
+		echo -e "${RC}Error updating components! Please specify the component name you want to update. Eg. ucs update EmptyState${NC}"
 	fi
 fi