From cf6e56e4d2b4af207691346560b9fcdc6a854035 Mon Sep 17 00:00:00 2001 From: slashtechno <77907286+slashtechno@users.noreply.github.com> Date: Fri, 4 Nov 2022 01:03:50 -0500 Subject: [PATCH] Fixed more miscellaneous issues in install script --- apps/golang/credits | 2 +- apps/golang/install | 4 ++-- apps/golang/uninstall | 22 +--------------------- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/apps/golang/credits b/apps/golang/credits index 45d5f04648..048c2206ff 100644 --- a/apps/golang/credits +++ b/apps/golang/credits @@ -1,4 +1,4 @@ (github.com/.../...) -canha/golang-tools-install-script - the install script +canha/golang-tools-install-scrip t - the install script golang/go - the language itself slashtechno - addition to Pi-Apps \ No newline at end of file diff --git a/apps/golang/install b/apps/golang/install index c3f351a065..280ed8714f 100755 --- a/apps/golang/install +++ b/apps/golang/install @@ -1,4 +1,4 @@ - +#!/bin/bash VERSION="1.19.2" [ -z "$GOROOT" ] && GOROOT="$HOME/.go" @@ -14,7 +14,7 @@ case "$arch" in *) error "arch variable is not set, can not continue" ;; - esac +esac if [ -z "$PLATFORM" ]; then echo "Your operating system is not supported by the script." diff --git a/apps/golang/uninstall b/apps/golang/uninstall index 46149f6668..9b2bd4e4a0 100755 --- a/apps/golang/uninstall +++ b/apps/golang/uninstall @@ -1,24 +1,4 @@ -OS="$(uname -s)" -ARCH="$(uname -m)" - -case $OS in - "Linux") - case $ARCH in - "aarch64") - ARCH=arm64 - ;; - "armv6" | "armv7l") - ARCH=armv6l - ;; - "armv8") - ARCH=arm64 - ;; - esac - PLATFORM="linux-$ARCH" - ;; - -esac - +#!/bin/bash rm -rf "$GOROOT" if [ "$OS" == "Darwin" ]; then if [ "$shell" == "fish" ]; then