Release v0.8.3

Author: Hernan Federico Morales

CHANGELOG.md

@@ -4,8 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [0.8.3](https://github.com/hernanmd/pi/compare/0.8.2...0.8.3)
+
 #### [0.8.2](https://github.com/hernanmd/pi/compare/0.8.1...0.8.2)
 
+> 18 April 2025
+
+- Release v0.8.2 [`bd373e0`](https://github.com/hernanmd/pi/commit/bd373e057bbc8bd847319120ddc02c85fe78c0c3)
+
 #### [0.8.1](https://github.com/hernanmd/pi/compare/0.8.0...0.8.1)
 
 > 14 July 2023

DATE

@@ -1 +1 @@
-18-04-2025
+02-07-2025

README.md

@@ -104,11 +104,6 @@ Installing a stable Pharo image in the current directory:
 pi image
 ```
 
-Install and run the latest Pharo image in a new timestamped directory:
-```bash
-pi nlrun
-```
-
 Installing NeoCSV package:
 ```bash
 pi install NeoCSV

libexec/piEnvVars.sh

@@ -26,6 +26,8 @@ set_zconf_url
 pkgVersion="stable"
 # Detected Operating System
 os="Unknown"
+# Default Pharo version to request if no version is provided
+pharoRequestedVersion="13"
 
 #################################
 ## GitHub Settings

libexec/piHelp.sh

@@ -37,10 +37,8 @@ The options include:
 	install <pkgname>	Install pkgname to the Image found in the current directory. Download image if not found.
 	list			List Pharo packages found in GitHub.
 	run			Run a Pharo Image.
-	irun			Download the stable image and run Pharo.image.
-	lrun			Download the latest image and run Pharo.image.
-	nrun			Download the stable image in a new timestamped directory and run Pharo.image.
-	nlrun			Download the latest image in a new timestamped directory and run Pharo.image.
+	irun			Download and run Pharo.image.
+	nrun			Download in a new timestamped directory and run Pharo.image.
 	trun			Trash pharo-local and run Pharo.image.
 	search <pkgname>	Search for pkgname in GitHub.
 	update			Update package directory.

libexec/piInstallPkg.sh

@@ -20,6 +20,11 @@ install_from_github () {
 
 # Read argument packages and install from their repositories
 install_packages () {
+	if [ $# -eq 0 ]; then
+		pi_log "Please specify at least one package to install\n"
+		printf "exit with error\n"
+		return 1
+	fi
 	printf "Installing packages...\n"
 	until [ -z "$1" ]; do
 		install_from_github "$1" 

libexec/piParseCmdOptions.sh

@@ -21,7 +21,7 @@ parse_cmd_line () {
 			examples && exit 0
 			;;
 		image | IMAGE )
-			install_pharo
+			install_pharo "${@:2}"
 			;;
 		init | INIT)
 			init_db
@@ -36,19 +36,13 @@ parse_cmd_line () {
 			run_pharo
 			;;
 		irun | IRUN )
-			irun_pharo
-			;;
-		lrun | LRUN )
-			lrun_pharo
+			irun_pharo "${@:2}"
 			;;
 		trun | TRUN )
 			trun_pharo
 			;;
 		nrun | NRUN )
-			nrun_pharo
-			;;
-		nlrun | NLRUN )
-			nlrun_pharo
+			nrun_pharo "${@:2}"
 			;;
 		search )
 			search_packages "${@:2}"

libexec/piPharo.sh

@@ -4,7 +4,6 @@
 #
 
 source "${BASH_SOURCE%/*}"/piUtils.sh
-pharoLatest="130+vm"
 
 find_os_id () {
 	# Find our distribution or OS
@@ -56,14 +55,6 @@ apt_install () {
 	sudo apt-get install libc6:i386 libssl1.0.0:i386 libfreetype6:i386
 }
 
-# For ElementaryOS
-# This function is currently not used
-ppa_install () {
-	add-apt-repository ppa:pharo/stable
-	apt-get update
-	apt-get install pharo-vm-desktop
-}
-
 # For CentOS/RedHat
 # This function is currently not used
 yum_install () {
@@ -86,10 +77,10 @@ linstall_pharo () {
 	case "$os" in
 		"arm64")
 			zeroConfUrl="http://files.pharo.org/vm/pharo-spur64-headless/Darwin-arm64/latest.zip"
-			download_pharo_m1_latest
+			download_pharo_arm64
 			;;
 		* )
-			download_pharo_latest
+			download_pharo_x86_64
 			;;
 	esac
 }
@@ -100,16 +91,13 @@ install_pharo () {
 	case "$os" in
 		"arm64")
 			zeroConfUrl="http://files.pharo.org/vm/pharo-spur64-headless/Darwin-arm64/latest.zip"
-			download_pharo_m1
+			download_pharo_arm64 $1
 			;;
 		"CentOS*" | "RedHat*" )
 			yum_install
 			;;
-		"Ubuntu*")
-			ppa_install
-			;;
 		* )
-			download_pharo
+			download_pharo_x86_64 $1
 			;;
 	esac
 }
@@ -137,13 +125,7 @@ run_pharo () {
 
 # Install a stable image and run Pharo
 irun_pharo () {
-	install_pharo
-	run_pharo
-}
-
-# Install latest Pharo and run Pharo.image
-lrun_pharo () {
-	linstall_pharo
+	install_pharo $1
 	run_pharo
 }
 
@@ -157,53 +139,36 @@ trun_pharo () {
 
 # Trash pharo-local (requires trash utility) and run Pharo.image
 nrun_pharo () {
-	dirname=$(date +%Y-%m-%d-%S)
-	(mkdir -v "$dirname" && cd "$dirname" && irun_pharo) || pi_log "Cannot run Pharo Image"
+	if [ ! $# -eq 0 ]; then
+		pharoRequestedVersion=$1
+	fi	
+	dirname="pharo-$pharoRequestedVersion-$(date +%Y-%m-%d-%S)"
+	(mkdir -v "$dirname" && cd "$dirname" && irun_pharo $1) || pi_log "Cannot run Pharo Image"
 }
 
-# Install latest Pharo in a new timestamed directory and run Pharo.image
-nlrun_pharo () {
-	dirname=$(date +%Y-%m-%d-%S)
-	(mkdir -v "$dirname" && cd "$dirname" && lrun_pharo) || pi_log "Cannot run Pharo Image"
-}
-
-download_pharo () {
+download_pharo_x86_64 () {
 	pi_log "Checking Pharo installation in the current directory...\n"
 	if ! is_pharo_installed; then
+		if [ ! $# -eq 0 ]; then
+			pharoRequestedVersion=$1
+		fi
+		# Convert to Zeroconf version, i.e. Requesting 13 -> 130
+		urlVersion="${pharoRequestedVersion}0+vm"		
 		pi_log "Downloading Pharo...\n"
-		exec $dApp $dPharoParams $zeroConfUrl | bash
+		exec $dApp $dPharoParams $zeroConfUrl/$urlVersion | bash
 	fi
 	[[ ! is_pharo_installed ]] && { pi_err "Could not download Pharo, exiting\n"; exit 1; }
 }
 
-download_pharo_latest () {
-	pi_log "Checking latest Pharo installation in the current directory...\n"
-	if ! is_pharo_installed; then
-		pi_log "Downloading latest Pharo...\n"
-		exec $dApp $dPharoParams $zeroConfUrl/$pharoLatest | bash
-	fi
-	[[ ! is_pharo_installed ]] && { pi_err "Could not download latest Pharo, exiting\n"; exit 1; }
-}
-
-download_pharo_m1 () {
+download_pharo_arm64 () {
 	pi_log "Checking Pharo installation in the current directory...\n"
 	if ! is_pharo_installed; then
+		# Convert to Zeroconf version, i.e. Requesting 13 -> 130
+		urlVersion="${pharoRequestedVersion}0"	
 		pi_log "Downloading Pharo...\n"
 		exec $dApp $zeroConfUrl
 		unzip latest.zip
-		exec $dApp $dPharoParams get.pharo.org/64 | bash -
-	fi
-	[[ ! is_pharo_installed ]] && { pi_err "Could not download Pharo, exiting\n"; exit 1; }	
-}
-
-# Latest version of Pharo for ZeroConf download
-download_pharo_m1_latest () {
-	pi_log "Checking latest Pharo installation in the current directory...\n"
-	if ! is_pharo_installed; then
-		pi_log "Downloading latest Pharo...\n"
-		exec $dApp $zeroConfUrl
-		unzip latest.zip
-		exec $dApp $dPharoParams get.pharo.org/64/$pharoLatest | bash -
+		exec $dApp $dPharoParams get.pharo.org/64/$urlVersion | bash -
 	fi
 	[[ ! is_pharo_installed ]] && { pi_err "Could not download latest Pharo, exiting\n"; exit 1; }	
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "description": "",
   "main": "index.js",
   "type": "module",