commit 130cc9326cc114dd5b0e3edd601e0946a750a7ab
parent da3990466caf2fa8d635dae9239e1dfc515f29cc
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Wed, 27 Mar 2019 09:18:30 +0100
Improve portability of upgrade script and fix remote targets
Diffstat:
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/bin/uu b/bin/uu
@@ -20,7 +20,7 @@ if [ "$(uname)" = "Linux" ]; then
         fi
 
         echo "Removing old packages"
-        sudo pacman -Sc --color auto
+        sudo pacman -Sc --color auto --noconfirm
     fi
     if type yay >/dev/null; then
         yay -Syu --color auto
@@ -33,7 +33,7 @@ if [ "$(uname)" = "Linux" ]; then
             sudo apt-get clean
     fi
 
-elif [ "$(uname)" = "Darwin" ]; then
+elif type brew >/dev/null; then
     echo "Fetching updates..."
     brew analytics off
     brew update && \
@@ -50,12 +50,12 @@ announce "Updating dotfiles"
 dotfiles pull
 dotfiles pull --recurse-submodules && m-all-sl
 
-if command -v conda >/dev/null 2>&1; then
+if type conda >/dev/null; then
     announce "Upgrading conda packages"
     conda update --all --yes
 fi
 
-if command -v julia >/dev/null 2>&1; then
+if julia >/dev/null; then
     announce "Upgrading julia packages"
     julia --color=yes -e 'import Pkg; Pkg.update()'
 fi
@@ -70,6 +70,7 @@ if [ -d ~/.zgen ]; then
 fi
 if [ -d ~/code/fffs ]; then
     announce "Upgrading fffs packages"
+    [ ! -h ~/bin/fffs ] && ln -s ~/code/fffs/fffs ~/bin/fffs
     fffs zsh update
 fi
 
@@ -79,6 +80,6 @@ if [ -d ~/.vim/vim-plugs ]; then
 fi
 
 if [ "$1" = 'all' ]; then
-    ssh andersdc@adamsgaard.dk -t '~/bin/uu'
-    ssh ad@idkfa.ucsd.edu -t '~/bin/uu'
+    ssh adamsgaard.dk -t '~/bin/uu'
+    ssh debvm -t '~/bin/uu'
 fi