Skip to content

Commit a44e049

Browse files
committed
Update copyrights
1 parent 9623a7d commit a44e049

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

zsh/.zgen-setup

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Only including a shebang to trigger editors to use shell
44
# syntax highlighting.
55
#
6-
# Copyright 2006-2020 Joseph Block <[email protected]>
6+
# Copyright 2006-2021 Joseph Block <[email protected]>
77
#
88
# BSD licensed, see LICENSE.txt
99

@@ -28,8 +28,6 @@ if [[ ! -f $ZGENOM_PARENT_DIR/zgenom/zgenom.zsh ]]; then
2828
popd
2929
fi
3030

31-
# echo "zgenom path - $ZGENOM_PARENT_DIR/zgenom/zgenom.zsh"
32-
3331
if [[ ! -f "$ZGENOM_PARENT_DIR/zgenom/zgenom.zsh" ]]; then
3432
echo "Can't find zgenom.zsh"
3533
else

zsh/.zsh_aliases

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Only including a shebang to trigger Sublime Text to use shell syntax highlighting
44
#
5-
# Copyright 2006-2018 Joseph Block <[email protected]>
5+
# Copyright 2006-2021 Joseph Block <[email protected]>
66
#
77
# BSD licensed, see LICENSE.txt in this repository.
88

@@ -15,7 +15,7 @@ if [[ -x /usr/local/bin/subl ]]; then
1515
alias s="subl"
1616
fi
1717

18-
# yes, these tests are ugly. They do however, work.
18+
# Yes, these tests are ugly. They do however, work.
1919
if [[ "$(uname -s)" == "Darwin" ]]; then
2020
# do OS X specific things
2121

zsh/.zsh_functions

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Only including a shebang to trigger editors shell syntax highlighting
44
#
5-
# Copyright 2006-2020 Joseph Block <[email protected]>
5+
# Copyright 2006-2021 Joseph Block <[email protected]>
66
#
77
# BSD licensed, see LICENSE.txt
88
#

zsh/.zshrc

+17-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2006-2020 Joseph Block <[email protected]>
1+
# Copyright 2006-2021 Joseph Block <[email protected]>
22
#
33
# BSD licensed, see LICENSE.txt
44
#
@@ -11,7 +11,7 @@
1111
# Uncomment following line if you want to disable autosetting terminal title.
1212
# DISABLE_AUTO_TITLE="true"
1313
#
14-
# Version 0.7
14+
# Version 1.0.0
1515

1616
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
1717
# Initialization code that may require console input (password prompts, [y/n]
@@ -71,7 +71,9 @@ load-our-ssh-keys() {
7171
#
7272
# You can use ssh-add -K /path/to/key to store pass phrases into
7373
# the macOS keychain
74-
ssh-add -A # load all ssh keys that have pass phrases stored in macOS keychain
74+
75+
# Load all ssh keys that have pass phrases stored in macOS keychain
76+
ssh-add -A
7577
fi
7678

7779
for key in $(find ~/.ssh -type f -a \( -name '*id_rsa' -o -name '*id_dsa' -o -name '*id_ecdsa' \))
@@ -88,15 +90,14 @@ if [[ -z "$SSH_CLIENT" ]]; then
8890
load-our-ssh-keys
8991
fi
9092

91-
# Now that we have $PATH set up and ssh keys loaded, configure zgen.
93+
# Now that we have $PATH set up and ssh keys loaded, configure zgenom.
9294

93-
# start zgen
95+
# Start zgenom
9496
if [ -f ~/.zgen-setup ]; then
9597
source ~/.zgen-setup
9698
fi
97-
# end zgen
9899

99-
# set some history options
100+
# Set some history options
100101
setopt append_history
101102
setopt extended_history
102103
setopt hist_expire_dups_first
@@ -114,13 +115,13 @@ setopt share_history
114115
#setopt noclobber
115116

116117
# Keep a ton of history. You can reset these without editing .zshrc by
117-
# adding a file to ~/.zshrc.d.
118+
# adding a file to ~/.zshrc.d that changes these variables.
118119
HISTSIZE=100000
119120
SAVEHIST=100000
120121
HISTFILE=~/.zsh_history
121122
export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"
122123

123-
# set some options about directories
124+
# Set some options about directories
124125
setopt pushd_ignore_dups
125126
#setopt pushd_silent
126127
setopt AUTO_CD # If a command is issued that can’t be executed as a normal command,
@@ -169,7 +170,9 @@ bindkey " " globalias
169170
bindkey "^ " magic-space # control-space to bypass completion
170171
bindkey -M isearch " " magic-space # normal space during searches
171172

172-
# Customize to your needs...
173+
# Make it easier to customize the quickstart to your needs without
174+
# having to maintain your own fork.
175+
173176
# Stuff that works on bash or zsh
174177
if [ -r ~/.sh_aliases ]; then
175178
source ~/.sh_aliases
@@ -186,7 +189,7 @@ fi
186189

187190
export LOCATE_PATH=/var/db/locate.database
188191

189-
# Load AWS credentials
192+
# Load AWS credentials when present
190193
if [ -f ~/.aws/aws_variables ]; then
191194
source ~/.aws/aws_variables
192195
fi
@@ -197,7 +200,7 @@ if [ -d /Library/Java/Home ];then
197200
fi
198201

199202
if [[ "$(uname -s)" == "Darwin" ]]; then
200-
# Load macOS-specific aliases
203+
# Load macOS-specific aliases - keep supporting the old name
201204
[ -f ~/.osx_aliases ] && source ~/.osx_aliases
202205
if [ -d ~/.osx_aliases.d ]; then
203206
for alias_file in ~/.osx_aliases.d/*
@@ -228,6 +231,8 @@ if [ "$TERM" = "screen" -a ! "$SHOWED_SCREEN_MESSAGE" = "true" ]; then
228231
fi
229232
fi
230233

234+
# grc colorizes the output of a lot of commands. If the user installed it,
235+
# use it.
231236
if [ -f /usr/local/etc/grc.bashrc ]; then
232237
source "$(brew --prefix)/etc/grc.bashrc"
233238

0 commit comments

Comments
 (0)