Skip to content

Improve portability and fix minor bugs #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CapriciousRebel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve portability and fix minor bugs #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions modules/git/gitconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,6 @@
# https://github.com/git/git/blob/90f7b16b3adc78d4bbabbd426fb69aa78c714f71/Documentation/config.txt#L2847-L2855

useConfigOnly = true
email = daniel@hails.info
name = Daniel Hails

# [!] DO NOT store sensitive information such as the Git user
# credentials (`name` / `email`), or things such as the `signingkey`
Expand Down
2 changes: 1 addition & 1 deletion modules/git/setup.github.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ github::get_gpg_key_id() {
gpgKeyId="$(gpg --list-secret-keys --keyid-format LONG \
| grep git-auto -B 2 \
| grep sec \
| perl -nle 'print && while m{(?<=/)[A-Z0-9]{16}}g')"
| perl -nle 'print $& while m{(?<=/)[A-Z0-9]{16}}g')"
}

github::set_gpg_key() {
Expand Down
2 changes: 1 addition & 1 deletion modules/zsh/zshenv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ for i in ${fpath[@]}; do
fi
done

. "$HOME/.cargo/env"
[[ -f "$HOME/.cargo/env" ]] && . "$HOME/.cargo/env"
16 changes: 5 additions & 11 deletions scripts/link.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,11 @@ link::file () {
}

link::extract_and_link() {
declare -A links
local sep=' -> '
while read line
while read -r line || [[ -n "$line" ]]
do
src=${line%%$sep*}
dst=${line#*$sep}
links[$src]=$dst
done < $1

for src in ${!links[*]}
do
link::file "$(dirname $1)/$src" "${links[$src]/#\~/$HOME}"
done
local src=${line%%$sep*}
local dst=${line#*$sep}
link::file "$(dirname "$1")/$src" "${dst/#\~/$HOME}"
done < "$1"
}