notwa/rc
1
0
Fork 0
mirror of https://github.com/notwa/rc synced 2025-02-05 07:43:22 -08:00
Code Issues Releases Wiki Activity

fix and rewrite pseudo-symlink file-finding loops

Browse source
This commit is contained in:
Connor Olding 2021-01-06 22:17:01 +01:00
parent 26445bf490
commit f36a293829
1 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
install
View file

@ -1,6 +1,6 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# this script is compatible with following shells: # this script is compatible with following shells:
# dash, ash, bash, zsh # dash, bash, zsh
note() { note() {
printf "%s\n" "$@" printf "%s\n" "$@"
@ -19,8 +19,7 @@ dotless() {
local f="$1" ind len local f="$1" ind len
ind="$(expr index "$f" .)" ind="$(expr index "$f" .)"
if [ "$ind" -gt 0 ]; then if [ "$ind" -gt 0 ]; then
len="$(expr length "$f")" REPLY="$(expr substr "$f" 2 "${#f}")"
REPLY="$(expr substr "$f" 2 "$len")"
else else
REPLY="$1" REPLY="$1"
fi fi
@ -60,6 +59,13 @@ softlink_nix() {
ln -s "$2" "$1" || die "couldn't symlink $1" ln -s "$2" "$1" || die "couldn't symlink $1"
} }
list_files() {
find "${1:-.}" -maxdepth 1 -printf "%P\n" | while read -r f; do
[ "${#f}" -gt 0 ] || continue
printf "%s\n" "$f"
done
}
softlink_pseudo() { softlink_pseudo() {
[ -d "$2" ] || die "$1 is not a directory to softlink" [ -d "$2" ] || die "$1 is not a directory to softlink"
@ -67,13 +73,14 @@ softlink_pseudo() {
mkdir "$1" || die "couldn't mkdir $1" mkdir "$1" || die "couldn't mkdir $1"
fi fi
find "$2" -maxdepth 1 | while read -r REPLY; do list_files "$2" | while read -r f; do
local d1="$1/$REPLY" local d1="$1/$f"
local d2="$2/$REPLY" local d2="$2/$f"
if [ -d "$d2" ]; then if [ -d "$d2" ]; then
if [ "$d1" != ".vim/bundle" ]; then # buggy on Windows if [ "$d1" != ".vim/bundle" ]; then # buggy on Windows
#warn $'\e[34m / \e[0m' "$d1 $d2" #warn $'\e[34m / \e[0m' "$d1 $d2"
softlink_pseudo "$d1" "$d2" || exit 1 softlink_pseudo "$d1" "$d2"
fi fi
elif [ -f "$d2" ]; then elif [ -f "$d2" ]; then
#warn $'\e[34m * \e[0m' "$d1" #warn $'\e[34m * \e[0m' "$d1"
@ -81,19 +88,22 @@ softlink_pseudo() {
else else
die "i don't know how to pseudo-symlink $d2" die "i don't know how to pseudo-symlink $d2"
fi fi
done
find "$2" -maxdepth 1 | while read -r REPLY; do done || exit $?
local d1="$1/$REPLY" }
local d2="$2/$REPLY"
find_new_files() {
list_files "$1" | while read -r f; do
local d1="$1/$f"
local d2="$2/$f"
[ "$d1" = ".vim/.netrwhist" ] && continue
[ "$d1" = ".vim/backup" ] && continue
[ "$d1" = ".vim/bundle" ] && continue
[ "$d1" = ".vim/swp" ] && continue
[ "$d1" = ".vim/undo" ] && continue
if [ -d "$d2" ]; then if [ -d "$d2" ]; then
: find_new_files "$d1" "$d2"
elif [ ! "$d1" -ef "$d2" ]; then elif [ ! "$d1" -ef "$d2" ]; then
[ "$d1" = ".vim/.netrwhist" ] && continue
[ "$d1" = ".vim/backup" ] && continue
[ "$d1" = ".vim/bundle" ] && continue
[ "$d1" = ".vim/swp" ] && continue
[ "$d1" = ".vim/undo" ] && continue
#warn "new destination file. consider manually moving it:" #warn "new destination file. consider manually moving it:"
#warn $'\e[32m + \e[0m' "$d1" #warn $'\e[32m + \e[0m' "$d1"
warn " + $d1" warn " + $d1"
@ -104,7 +114,8 @@ softlink_pseudo() {
softlink() { softlink() {
if [ -n "$MSYSTEM" ]; then if [ -n "$MSYSTEM" ]; then
# MSYS2 does not have nor emulate symbolic links. # MSYS2 does not have nor emulate symbolic links.
softlink_pseudo "$@" || exit 1 softlink_pseudo "$@"
find_new_files "$@" # to make up for git status not seeing new files
else else
softlink_nix "$@" softlink_nix "$@"
fi fi