macOS portability

Author: MaskRay

deploy.bash renamed to deploy.zsh

@@ -1,10 +1,10 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh
 set -e
 
 files=($(git ls-files | egrep -v 'backup|.ssh|proxy.pac.coffee|weechat'))
 target=~
 LN_OPT=-sf
-[[ $(ln --version) =~ coreutils ]] && LN_OPT=-sfr
+[[ $(uname) =~ Linux && $(ln --version) =~ coreutils ]] && LN_OPT=-sfr
 
 declare -A dir
 dir[.vim]=1
@@ -54,7 +54,7 @@ do_mkdir
 do_ssh
 do_git
 
-for f in "${!dir[@]}"; do
+for f in "${(@k)dir[@]}"; do
   g="$target/${f/home\//}"
   mkdir -p "${g%/*}"
   if ! [[ -L "$g" ]]; then
@@ -92,7 +92,7 @@ for f in ${files[@]}; do
         diff -u "$g" "$f" | less -FMX
         while :; do
           warning "Overwrite $g ?\n(y)es (n)o (m) vim -d (q)uit [y/n/m/q]"
-          read -rsn 1 option
+          read -rs 'option?Option: '
           case $option in
             [ny])
               break;;

home/.alias

@@ -1,7 +1,7 @@
 # vim: set ft=sh fdm=marker:
 
 GNU=
-[[ -f /etc/freebsd-update.conf ]] || GNU=1
+[[ -f /etc/lsb-release ]] && GNU=1
 if [[ -n $GNU ]]; then
   alias ls=$'ls -XF --group-directories-first --color=auto --time-style="+\e[33m[\e[32m%Y-%m-%d \e[35m%k:%M\e[33m]\e[m"'
 else

home/.zprofile

@@ -33,8 +33,6 @@ if [[ $TERM =~ 256 ]] {
 # End underlining
 export LESS_TERMCAP_ue=$'\e[0m'
 
-if (( ! ${+SSH_AUTH_SOCK} )) {
+if [[ $(uname) != Darwin && ${+SSH_AUTH_SOCK} == 1 ]] {
   export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
 }
-
-export PATH="$HOME/.cargo/bin:$PATH"

home/.zshrc

@@ -468,5 +468,5 @@ fi
 if [[ -f ~/bin/modulecmd.tcl ]]; then
   module() { eval `~/bin/modulecmd.tcl zsh $*`; }
   module use ~/.modules
-  module load ruby/2.7.0 wasm #go nodejs rust yarn #nim wps mpi/impi
+  module load ruby/2.7.0 #wasm go nodejs rust yarn #nim wps mpi/impi
 fi