Minor modifications echo -> printf. Refactorings

hernanmd · hernanmd · commit 8ccb73046075 · 2019-10-29T16:42:18.000-03:00
diff --git a/bin/pi b/bin/pi
@@ -7,9 +7,9 @@
 # Fail fast and be aware of exit codes
 set -eo pipefail
 
-source "${BASH_SOURCE%/*}"/../libexec/pi/piEnvVars.sh
-source "${BASH_SOURCE%/*}"/../libexec/pi/piUtils.sh
-source "${BASH_SOURCE%/*}"/../libexec/pi/piParseCmdOptions.sh
+source "${BASH_SOURCE%/*}"/../libexec/piEnvVars.sh
+source "${BASH_SOURCE%/*}"/../libexec/piUtils.sh
+source "${BASH_SOURCE%/*}"/../libexec/piParseCmdOptions.sh
 
 #################################
 ## Main Section
diff --git a/install.sh b/install.sh
@@ -57,7 +57,7 @@ check_install() {
 }
 
 check_noroot() {
-	[[ "$(whoami)" != "root" ]] || die "Don't install with sudo or as root"	
+	[[ "$(whoami)" != "root" ]] || die "Don't install with sudo or as root"
 }
 
 install_pi() {
@@ -191,4 +191,4 @@ else
 	main "$@"
 fi
 
-} # End of wrapping
+} # End of wrapping
diff --git a/libexec/piInstallPkg.sh b/libexec/piInstallPkg.sh
@@ -12,7 +12,7 @@ source "${BASH_SOURCE%/*}"/piCatalog.sh
 # Detect which Configuration version to install.
 # This setting is global: Applied to all Configuration names passed as parameters.
 setPkgVersionSetting () {
-	echo "Setting package version..."
+	printf "Setting package version...\n"
 	for param in "$@"; do
 		case "$param" in
 			"--dev")
@@ -23,31 +23,42 @@ setPkgVersionSetting () {
 				;;
 		esac
 	done
-	echo "Selected package version: $pkgVersion"
+	printf "Selected package version: \n" "$pkgVersion"
+}
+
+install_from_catalog () {
+	printf "Trying to install from Pharo Catalog...\n"
+	if ! (pkgCatalogInstall "$1"); then
+		printf "not found\n"
+	else
+		printf "done\n"
+}
+
+install_from_smalltalkhub () {
+	printf "Trying to install from SmalltalkHub...\n"
+	if ! (pkgSHInstall "$1"); then
+		printf "not found\n"
+	else
+		printf "done\n"
+	fi
+}
+
+install_from_github () {
+	printf "Trying to install from GitHub...\n"
+	if ! (pkgGHInstall "$1"); then
+		printf "not found\n"
+	else
+		printf "done\n"
+	fi
 }
 
 # Read argument packages and install from their repositories
 install_packages () {
-	echo "Installing packages..."
+	printf "Installing packages...\n"
 	until [ -z "$1" ]; do
-		echo "Trying to install from Pharo Catalog..."
-		if ! (pkgCatalogInstall "$1"); then
-			echo "not found"
-			echo "Trying to install from SmalltalkHub..."
-			if ! (pkgSHInstall "$1"); then
-				echo "not found"
-				echo "Trying to install from GitHub..."
-				if ! (pkgGHInstall "$1"); then
-					echo "not found"
-				else
-					echo "done"
-				fi
-			else
-				echo "done"
-			fi
-		else
-			echo "done"
-		fi
+		install_from_catalog "$1"
+		install_from_smalltalkhub "$1"
+		install_from_github "$1"
 		shift
 	done
-}
+}
diff --git a/libexec/piPharo.sh b/libexec/piPharo.sh
@@ -61,12 +61,12 @@ install_pharo () {
 #################################
 ## Pharo Installation Section
 #################################
+
 dlPharo () {
 	# echo_line "Checking Pharo installation in the current directory..."
-	[[ ! -f $imageName ]] && { 
-		echo "Downloading Pharo..."
-		#exec $dApp $dPharoParams get.pharo.org/$pharoVersion | bash
+	[[ ! -f $imageName ]] && {
+		printf "Downloading Pharo...\n"
 		exec $dApp $dPharoParams $zeroConfUrl | bash
 	}
-	[[ ! -f pharo ]] && { echo "Try again. Pharo was not downloaded correctly, exiting"; exit 1; }
+	[[ ! -f pharo ]] && { printf "Could not download Pharo, exiting\n"; exit 1; }
 }
diff --git a/libexec/piSearch.sh b/libexec/piSearch.sh
@@ -28,7 +28,7 @@ searchgh_packages () {
 search_packages () {
 	silentMode=1
 	pkg_name="$1"
-	[[ ! -z $pkg_name ]] || { echo "Missing package name. Exiting"; exit 1; }
+	[[ ! -z $pkg_name ]] || { printf "Missing package name. Exiting\n"; exit 1; }
 	searchsh_packages $pkg_name
 	searchgh_packages $pkg_name
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ check_install() {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`check_noroot() {`
`60`		`- [[ "$(whoami)" != "root" ]] \|\| die "Don't install with sudo or as root"`
	`60`	`+ [[ "$(whoami)" != "root" ]] \|\| die "Don't install with sudo or as root"`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`install_pi() {`
`@@ -191,4 +191,4 @@ else`
`191`	`191`	`main "$@"`
`192`	`192`	`fi`
`193`	`193`
`194`		`-} # End of wrapping`
	`194`	`+} # End of wrapping`