Minor updates to jq and go installation scripts

Author: yarikbratashchuk

public/install-go.sh

@@ -7,11 +7,10 @@
 deps=( curl jq )
 
 for dep in "${deps[@]}"; do
-    if ! command -v "$dep" &> /dev/null; then
-        echo "$dep is not installed. Downloading and executing the script..."
-        curl -sSL https://rollkit.dev/install-jq.sh | bash
-        exit $?
-    fi
+	if ! command -v "$dep" &> /dev/null; then
+		echo "$dep is not installed. Downloading and executing the script..."
+		curl -sSL https://rollkit.dev/install-jq.sh | bash
+	fi
 done
 
 version="${1:-$(curl -s 'https://go.dev/dl/?mode=json' | jq -r '.[0].version')}"
@@ -25,15 +24,26 @@ update_go() {
 	local arch="$1"
 	local os="$2"
 
-	local go_url="https://golang.org/dl/${version}.${os}-${arch}.tar.gz"
+	local go_url="https://golang.org/dl/go${version}.${os}-${arch}.tar.gz"
 
-	curl -so "/tmp/${version}.${os}-${arch}.tar.gz" -L "$go_url" && \
-		rm -rf /usr/local/go && tar -C /usr/local -xzf /tmp/${version}.${os}-${arch}.tar.gz
+	echo "Downloading Go from ${go_url}"
 
-	tar -C /usr/local -xzf "/tmp/${version}.${os}-${arch}.tar.gz" && \
-		echo "Go updated to version ${version}"
+	curl -so "/tmp/go${version}.${os}-${arch}.tar.gz" -L "$go_url"
+	if [ $? -eq 0 ]; then
+		tar -C /usr/local -xzf "/tmp/go${version}.${os}-${arch}.tar.gz"
+		if [ $? -ne 0 ]; then
+			echo "Failed to extract Go. Possibly corrupted download."
+			rm "/tmp/go${version}.${os}-${arch}.tar.gz"
+			exit 1
+		else
+			echo "Go updated to version ${version}"
+		fi
+	else
+		echo "Failed to download Go from ${go_url}"
+		exit 1
+	fi
 
-	rm "/tmp/${version}.${os}-${arch}.tar.gz"
+	rm "/tmp/go${version}.${os}-${arch}.tar.gz"
 }
 
 case "$(uname -s)" in

public/install-jq.sh

@@ -1,39 +1,42 @@
 #!/bin/bash
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
-    echo "Detected macOS. Installing jq..."
-    if ! command -v brew &> /dev/null; then
-        echo "Homebrew is not installed. Installing Homebrew..."
-        /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-	# adding /opt/homebrew/bin to the $PATH variable based on the shell
-	if [[ -f "$HOME/.bash_profile" ]]; then
-		echo 'export PATH="/opt/homebrew/bin:$PATH"' >> "$HOME/.bash_profile"
-		source "$HOME/.bash_profile"
-	elif [[ -f "$HOME/.zshrc" ]]; then
-		echo 'export PATH="/opt/homebrew/bin:$PATH"' >> "$HOME/.zshrc"
-		source "$HOME/.zshrc"
-	else
-		echo "Unsupported shell. Please add /opt/homebrew/bin to your PATH manually."
-
-    fi
-    brew install jq
-    echo "jq has been installed successfully."
-    
+	echo "Detected macOS. Installing jq..."
+	if ! command -v brew &> /dev/null; then
+		echo "Homebrew is not installed. Installing Homebrew..."
+		/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+		# adding /opt/homebrew/bin to the $PATH variable based on the shell
+		if [[ -f "$HOME/.bash_profile" ]]; then
+			echo 'export PATH="/opt/homebrew/bin:$PATH"' >> "$HOME/.bash_profile"
+			source "$HOME/.bash_profile"
+		elif [[ -f "$HOME/.bashrc" ]]; then
+			echo 'export PATH="/opt/homebrew/bin:$PATH"' >> "$HOME/.bashrc"
+			source "$HOME/.bashrc"
+		elif [[ -f "$HOME/.zshrc" ]]; then
+			echo 'export PATH="/opt/homebrew/bin:$PATH"' >> "$HOME/.zshrc"
+			source "$HOME/.zshrc"
+		else
+			echo "Unsupported shell. Please add /opt/homebrew/bin to your PATH manually."
+			exit 1
+		fi
+	fi  # Closing the brew installation check
+	brew install jq
+	echo "jq has been installed successfully."
 elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    echo "Detected Linux. Installing jq..."
-    if command -v apt &> /dev/null; then
-        sudo apt update
-        sudo apt install -y jq
-    elif command -v yum &> /dev/null; then
-        sudo yum install -y epel-release
-        sudo yum install -y jq
-    else
-        echo "Unsupported package manager. Please install jq manually."
-        exit 1
-    fi
-    echo "jq has been installed successfully."
-    
+	echo "Detected Linux. Installing jq..."
+	if command -v apt &> /dev/null; then
+		sudo apt update
+		sudo apt install -y jq
+	elif command -v yum &> /dev/null; then
+		sudo yum install -y epel-release
+		sudo yum install -y jq
+	else
+		echo "Unsupported package manager. Please install jq manually."
+		exit 1
+	fi
+	echo "jq has been installed successfully."
 else
-    echo "Unsupported operating system."
-    exit 1
-fi
+	echo "Unsupported operating system."
+	exit 1
+fi  # Closing the OS type check
+