Try to install from GitHub first, then Catalog, finally SmalltalkHub

Author: hernanmd

libexec/piGitHub.sh

@@ -75,7 +75,8 @@ countgh_packages () {
 	silentMode=1
 	downloadGitHubPkgNames "$pageIndex" "$perPage"
 	parseGitHubPkgCount ${cacheDir}/"$pageIndex.js"
-	echo "# Packages found in GitHub: $ghPkgCount"
+	printf "Number of packages in GitHub: %s: " "$ghPkgCount"
+	printf
 }
 
 # Install from GitHub
@@ -86,32 +87,31 @@ pkgGHInstall () {
 	pkgFound=$(echo $pkgs | grep -w "$pkgName")
 	pkgCount=$(echo "$pkgFound" | wc -l)
 
-	echo "Found $pkgCount package(s) with the name $pkgName."
+	printf "Found %s package(s) with the name %s" "$pkgCount" "$pkgName"
 	if [ "$pkgCount" -gt 1 ]; then
-		echo "Listing follows..."
+		printf "Listing follows...\n"
 		cat -n <<< "$pkgFound"
 		return 1
 	else
-		echo "Selected package: $pkgFound"
+		printf "Selected package: %s" "$pkgFound"
 		# Parse GitHub user name
 		IFS=/ read p user <<< "$pkgFound"
 
 		# echo "Packages = $pkgs"
 		echo "User = $user"
 		echo "Pkg = $pkgFound"
 		# Download README.md file
-#		$dApp -d -O README.md "https://raw.githubusercontent.com/$user/$pkgName/master/README.md"
+		$dApp -d -O README.md "https://raw.githubusercontent.com/$user/$pkgName/master/README.md"
 #		[ -f "README.md" ] || exit 1
 		# Extract installation expression from tag
-#		local installExpr=$(grep "^\[//]\:\ #\ (pist)" -A 8 README.md \
-#			| sed '/\#/d;/^\[/d;/^[[:space:]]*$/d;/.*smalltalk/d;/```/d')
+		local installExpr=$(grep "^\[//]\:\ #\ (pist)" -A 8 README.md | sed '/\#/d;/^\[/d;/^[[:space:]]*$/d;/.*smalltalk/d;/```/d')
 		# local instDevExpr=$(grep "^\[//]\:\ #\ (pidev)" README.md | sed 's/.*smalltalk//;s/\(.*\).../\1/')
 		if [ -z "$installExpr" ]; then
 			echo "Installation expression not found."
 			return $?
 		fi
 	fi
-	echo "Install command: ./pharo $imageName eval $installExpr"
-#	./pharo "$imageName" eval "$installExpr"
+	printf "Install command: ./pharo %s eval %s" "$imageName" "$installExpr"
+	./pharo "$imageName" eval "$installExpr"
 	return $?
 }

libexec/piInstallPkg.sh

@@ -23,42 +23,47 @@ setPkgVersionSetting () {
 				;;
 		esac
 	done
-	printf "Selected package version: \n" "$pkgVersion"
+	printf "Selected package version: %s\n" "$pkgVersion"
 }
 
 install_from_catalog () {
 	printf "Trying to install from Pharo Catalog...\n"
 	if ! (pkgCatalogInstall "$1"); then
 		printf "not found\n"
+		return 1
 	else
 		printf "done\n"
+		return 0
+	fi
 }
 
 install_from_smalltalkhub () {
 	printf "Trying to install from SmalltalkHub...\n"
 	if ! (pkgSHInstall "$1"); then
 		printf "not found\n"
+		return 1
 	else
 		printf "done\n"
+		return 0
 	fi
 }
 
 install_from_github () {
 	printf "Trying to install from GitHub...\n"
 	if ! (pkgGHInstall "$1"); then
 		printf "not found\n"
+		return 1
 	else
 		printf "done\n"
+		return 0
 	fi
 }
 
 # Read argument packages and install from their repositories
 install_packages () {
 	printf "Installing packages...\n"
 	until [ -z "$1" ]; do
-		install_from_catalog "$1"
-		install_from_smalltalkhub "$1"
-		install_from_github "$1"
+		install_from_github "$1" || install_from_catalog "$1" || install_from_smalltalkhub "$1"
 		shift
 	done
 }