diff --git a/golang-update.sh b/golang-update.sh new file mode 100755 index 0000000..a348e46 --- /dev/null +++ b/golang-update.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# the command used to initialize our subtree +#git subtree add --prefix golang-install https://github.com/canha/golang-tools-install-script.git master --squash + +# the command used to update our subtree +git subtree pull --prefix golang-install https://github.com/canha/golang-tools-install-script.git master --squash + diff --git a/one-time-stuff/install-software.sh b/one-time-stuff/install-software.sh index 11475f0..459ce51 100755 --- a/one-time-stuff/install-software.sh +++ b/one-time-stuff/install-software.sh @@ -42,7 +42,7 @@ function install_collection () { called_update=true fi echo "Installing $1" - sudo apt install "${@:2}" + sudo apt install "${@:2}" -y ;; * ) echo 'Skipping' @@ -76,6 +76,20 @@ case $nginx_log in ;; esac +echo "----- Install Go Lang -------------------------------" +read -p 'Install Go Lang? [y/N]: ' go_lang +case $go_lang in + [Yy]* ) + echo "----- Calling Go Install Script ---------------------" + LOCATION=`dirname "$0"` + "${LOCATION}/../golang-install/goinstall.sh" + echo "----- Completed Go Install Script -------------------" + ;; + * ) + echo 'Skipping' + ;; +esac + echo "----- Install php-fpm -------------------------------" install_collection 'php-fpm' php-cli php-fpm php-bcmath php-curl php-gd php-gmp php-imagick imagemagick php-intl php-json php-mbstring php-mysql php-redis php-soap php-xml php-yaml php-zip diff --git a/upgrade.sh b/upgrade.sh index 6d4bb62..7a2c5c6 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -1,21 +1,21 @@ #!/bin/bash echo "----- APT Update ------------------------------------" -sudo apt update +sudo apt update -y echo "" echo "----- APT Upgrade -----------------------------------" -sudo apt upgrade +sudo apt upgrade -y echo "" echo "----- APT DistUpgrade -------------------------------" -sudo apt dist-upgrade +sudo apt dist-upgrade -y echo "" echo "----- APT AutoRemove --------------------------------" -sudo apt autoremove +sudo apt autoremove -y echo "" echo "----- APT AutoClean ---------------------------------" -sudo apt autoclean +sudo apt autoclean -y