setup includes media sync and defaults editor; moved almost all prompts to the start of the setup

This commit is contained in:
Wryn Wagner
2021-09-24 10:20:54 -06:00
parent 72d6e76602
commit e04a16bbcd
11 changed files with 86 additions and 65 deletions

View File

@@ -3,7 +3,6 @@
function ZSH__SETUP() {
ZSH__SET_DEFAULT_SHELL
ZSH__SOURCE_RC
ZSH__SET_LOCAL_CONFIG
}
#####################################################################
@@ -27,28 +26,3 @@ function ZSH__SOURCE_RC() {
&& OK || WARN
}
}
function ZSH__SET_LOCAL_CONFIG() {
local DEFAULT_CONFIG="$DOTWRYN_PATH/env/env.zsh"
local LOCAL_CONFIG="$HOME/.config/wryn/env/env.zsh"
[ -f $LOCAL_CONFIG ] && {
WARNING "local zsh env configuration ($LOCAL_CONFIG)"
USER_PROMPT 'overwrite? [y/N]'
READ_K yn
[[ $yn =~ ^[yY] ]] && {
CHECK "backing up local copy ($LOCAL_CONFIG.bak)"
mv "$LOCAL_CONFIG" "$LOCAL_CONFIG.bak" && OK || WARN
} || {
STATUS 'skipping'
return
}
}
CHECK "setting zsh configuration file ($LOCAL_CONFIG)"
{
echo "source $DEFAULT_CONFIG"
echo -e '\n#\n# .wryn configuration overrides\n#\n'
sed 's/^[^#].*/#&/' $DEFAULT_CONFIG
} > $LOCAL_CONFIG && OK || WARN
}