Skip to content

Commit

Permalink
Merge branch 'master' into prompt_command_append
Browse files Browse the repository at this point in the history
Conflicts:
	z.sh
  • Loading branch information
rupa committed Jun 10, 2013
2 parents 9c6a7ac + 9e1e288 commit 4d77b08
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion z.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ _z() {

# maintain the file
local tempfile
tempfile="$(mktemp "$datafile.XXXXXX")" || return
tempfile="$datafile.$RANDOM"
while read line; do
[ -d "${line%%\|*}" ] && echo $line
done < "$datafile" | awk -v path="$*" -v now="$(date +%s)" -F"|" '
Expand Down

0 comments on commit 4d77b08

Please sign in to comment.