diff --git a/init_user.sh b/init_user.sh index 5804c25..12848b9 100755 --- a/init_user.sh +++ b/init_user.sh @@ -8,19 +8,6 @@ scriptdir=$(dirname $(realpath $0)) # ============================================================ -update_authorized_keys() { - [ ! -f ~/.ssh/authorized_keys ] && return - - local public_keys=$(cat $scriptdir/files/authorized_keys) - while IFS= read -r public_key; do - [[ $public_key == \#* ]] && continue - if ! grep -q "$public_key" ~/.ssh/authorized_keys; then - echo "$public_key" >> ~/.ssh/authorized_keys - echo "Added public key to authorized_keys: $public_key" - fi - done <<< "$public_keys" -} - configure_ssh() { [ -f ~/.ssh/authorized_keys ] && return diff --git a/run.sh b/run.sh index eb28e1e..9fd143a 100755 --- a/run.sh +++ b/run.sh @@ -12,15 +12,7 @@ scriptdir=$(dirname $(realpath $0)) git -C $scriptdir pull -update_file $scriptdir/files/zsh/00-init.zsh ~/.oh-my-zsh/custom/00-init.zsh -update_file $scriptdir/files/zsh/10-theme.zsh ~/.oh-my-zsh/custom/10-theme.zsh -update_file $scriptdir/files/zsh/20-function.zsh ~/.oh-my-zsh/custom/20-function.zsh -update_file $scriptdir/files/zsh/50-alias.zsh ~/.oh-my-zsh/custom/50-alias.zsh -update_file $scriptdir/files/zsh/80-env.zsh ~/.oh-my-zsh/custom/80-env.zsh -update_file $scriptdir/files/zsh/81-proxy.zsh ~/.oh-my-zsh/custom/81-proxy.zsh -update_file $scriptdir/files/zsh/90-other.zsh ~/.oh-my-zsh/custom/90-other.zsh -update_file $scriptdir/files/zsh/ys-simple.zsh-theme ~/.oh-my-zsh/custom/themes/ys-simple.zsh-theme -update_authorized_keys +$scriptdir/update.sh if [ "$1" = "update" ]; then exit 0 diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..551fc80 --- /dev/null +++ b/update.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +scriptdir=$(dirname $(realpath $0)) + +# ============================================================ + +update_file() { + local A="$1" + local B="$2" + + if [ -f "$A" ] && [ -f "$B" ] && [ "$(cat "$A")" != "$(cat "$B")" ]; then + cp "$A" "$B" + echo "File $B has been updated." + fi +} + +update_authorized_keys() { + [ ! -f ~/.ssh/authorized_keys ] && return + + local public_keys=$(cat $scriptdir/files/authorized_keys) + while IFS= read -r public_key; do + [[ $public_key == \#* ]] && continue + if ! grep -q "$public_key" ~/.ssh/authorized_keys; then + echo "$public_key" >> ~/.ssh/authorized_keys + echo "Added public key to authorized_keys: $public_key" + fi + done <<< "$public_keys" +} + +# ============================================================ + +update_file $scriptdir/files/zsh/00-init.zsh ~/.oh-my-zsh/custom/00-init.zsh +update_file $scriptdir/files/zsh/10-theme.zsh ~/.oh-my-zsh/custom/10-theme.zsh +update_file $scriptdir/files/zsh/20-function.zsh ~/.oh-my-zsh/custom/20-function.zsh +update_file $scriptdir/files/zsh/50-alias.zsh ~/.oh-my-zsh/custom/50-alias.zsh +update_file $scriptdir/files/zsh/80-env.zsh ~/.oh-my-zsh/custom/80-env.zsh +update_file $scriptdir/files/zsh/81-proxy.zsh ~/.oh-my-zsh/custom/81-proxy.zsh +update_file $scriptdir/files/zsh/90-other.zsh ~/.oh-my-zsh/custom/90-other.zsh +update_file $scriptdir/files/zsh/ys-simple.zsh-theme ~/.oh-my-zsh/custom/themes/ys-simple.zsh-theme +update_authorized_keys diff --git a/utils.sh b/utils.sh index fee831a..b7a1d89 100755 --- a/utils.sh +++ b/utils.sh @@ -30,16 +30,6 @@ check_google_access() { fi } -update_file() { - local A="$1" - local B="$2" - - if [ -f "$A" ] && [ -f "$B" ] && [ "$(cat "$A")" != "$(cat "$B")" ]; then - cp "$A" "$B" - echo "File $B has been updated." - fi -} - confirm_action() { local prompt="$1" local default_response="$2"