diff --git a/home/bashrc b/home/bashrc index 7c0fbd4..1694a97 100644 --- a/home/bashrc +++ b/home/bashrc @@ -29,7 +29,7 @@ ret_fail="$_title${Cfail}$_line1\n${Cfail}$_line2" PROMPT_COMMAND='[ $? = 0 ] && PS1=${ret_succ} || PS1=${ret_fail}' -. ~/.-shrc +. ~/.shrc # this doesn't work for all scripts at the moment, but ADDPATH "$HOME/sh" diff --git a/home/-shrc b/home/shrc similarity index 99% rename from home/-shrc rename to home/shrc index e960044..856134c 100644 --- a/home/-shrc +++ b/home/shrc @@ -53,7 +53,7 @@ export EA_AUTH="auth" export EA_DIR="t" export EA_DOMAIN="https://eaguru.guru" export EDITOR=vim -export ENV="$HOME/.-shrc" # for dash +export ENV="$HOME/.shrc" # for dash and ash export PAGER=less export PYTHONIOENCODING=utf-8 # damnit python! export SSH_AUTH_SOCK=0 # more info: https://0x0.st/NUnw diff --git a/home/zshrc b/home/zshrc index 8c91435..1c4f45b 100644 --- a/home/zshrc +++ b/home/zshrc @@ -195,7 +195,7 @@ else hash -d py=~/Dropbox/py fi -. ~/.-shrc +. ~/.shrc alias -g OMFG="1>/dev/null" ### @ OMFG - silence stdout. alias -g STFU="2>/dev/null" ### @ STFU - silence stderr. diff --git a/install b/install index 9838bda..9239153 100755 --- a/install +++ b/install @@ -130,7 +130,7 @@ cd "${HOME:?HOME variable empty or unset}" || die "failed to change directory" backup_dir="$rc/backup-$(date -u '+%s')" [ ! -d "$backup_dir" ] || die "backup directory already exists" -for f in .bashrc .zshrc .prep .-shrc .prezto-compinit .ls_colors \ +for f in .shrc .bashrc .zshrc .prep .prezto-compinit .ls_colors \ .vimrc .inputrc .Xresources .screenrc .tmux.conf; do hardlink "$f" "$rc/home/${f#.}" done diff --git a/regenerate b/regenerate index 102983a..aa81b5e 100755 --- a/regenerate +++ b/regenerate @@ -59,7 +59,7 @@ else #( cd temp; HOME="$rc/temp" dash ./install ) ln temp/home/zshrc temp/.zshrc || die 'failed to copy files' - ln temp/home/-shrc temp/.-shrc || die 'failed to copy files' + ln temp/home/shrc temp/.shrc || die 'failed to copy files' ln temp/home/bashrc temp/.bashrc || die 'failed to copy files' # use new documentation-generating scripts on old shell scripts. diff --git a/sh/compile b/sh/compile index 693f543..322549e 100755 --- a/sh/compile +++ b/sh/compile @@ -63,7 +63,7 @@ compile() { ### @- ### # debug build ### compile rd.c ### compile debug rd.c - ### # debug build with warning/error flags defined in .-shrc + ### # debug build with warning/error flags defined in ~/sh/arrays ### # (requires .zshrc for global alias expansion) ### compile WHOA rd.c ### # likewise for C++ diff --git a/sh/document b/sh/document index a9e6b9d..bc18565 100755 --- a/sh/document +++ b/sh/document @@ -108,7 +108,7 @@ document1() { fi # sanity check: - [ -d sh ] && [ -f .zshrc ] && [ -f .-shrc ] && [ -f .bashrc ] || return 3 + [ -d sh ] && [ -f .zshrc ] && [ -f .shrc ] && [ -f .bashrc ] || return 3 # create new output file (with a tilde as not to overwrite just yet): : > "$out" || return 4 @@ -140,7 +140,7 @@ document1() { printf '\n## %s\n' 'miscellaneous' >> "$out" || return 5 document2 .zshrc >> "$out" || return document2 .bashrc >> "$out" || return - document2 .-shrc >> "$out" || return + document2 .shrc >> "$out" || return } document() { ### @-