diff --git a/bindata.go b/bindata.go index 967e758..4af38fe 100644 --- a/bindata.go +++ b/bindata.go @@ -48,7 +48,7 @@ func (fi bindataFileInfo) Sys() interface{} { var _initBash = []byte(`PROMPT_COMMAND=bronze_prompt bronze_prompt() { - PS1="$(STATUS=$? JOBS=$(jobs -p | wc -l) bronze print "${BRONZE[@]}") " + PS1="$(status=$? jobs=$(jobs -p | wc -l) bronze print "${BRONZE[@]}") " } `) @@ -62,7 +62,7 @@ func initBash() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init.bash", size: 122, mode: os.FileMode(420), modTime: time.Unix(1499855240, 0)} + info := bindataFileInfo{name: "init.bash", size: 122, mode: os.FileMode(420), modTime: time.Unix(1499919910, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -75,7 +75,7 @@ preexec() { } precmd() { - PROMPT="$(env STATUS=$? JOBS=$#jobstates CMDTIME=$(($(date +%s%3N)-$BRONZE_START))ms bronze print "${BRONZE[@]}") " + PROMPT="$(env status=$? jobs=$#jobstates cmdtime=$(($(date +%s%3N)-$BRONZE_START))ms bronze print "${BRONZE[@]}") " } `) @@ -89,12 +89,12 @@ func initZsh() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init.zsh", size: 225, mode: os.FileMode(420), modTime: time.Unix(1499855228, 0)} + info := bindataFileInfo{name: "init.zsh", size: 225, mode: os.FileMode(420), modTime: time.Unix(1499919920, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _initFish = []byte(`function fish_prompt; env STATUS=$status JOBS=(count (jobs -p)) CMDTIME={$CMD_DURATION}ms bronze print $BRONZE; echo -n ' '; end +var _initFish = []byte(`function fish_prompt; env status=$status jobs=(count (jobs -p)) cmdtime={$CMD_DURATION}ms bronze print $BRONZE; echo -n ' '; end `) func initFishBytes() ([]byte, error) { @@ -107,7 +107,7 @@ func initFish() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "init.fish", size: 129, mode: os.FileMode(420), modTime: time.Unix(1499855206, 0)} + info := bindataFileInfo{name: "init.fish", size: 129, mode: os.FileMode(420), modTime: time.Unix(1499919929, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/cmdtime.go b/cmdtime.go index aaba831..6066981 100644 --- a/cmdtime.go +++ b/cmdtime.go @@ -7,7 +7,7 @@ import ( ) func cmdTimeSegment(segment *segment) { - duration, err := time.ParseDuration(os.Getenv("CMDTIME")) + duration, err := time.ParseDuration(os.Getenv("cmdtime")) if err != nil { if shell == "bash" { fmt.Fprintln(os.Stderr, "bronze: The 'cmdtime' command is supported in bash.") diff --git a/init.bash b/init.bash index 9ac34a5..71558e6 100644 --- a/init.bash +++ b/init.bash @@ -1,4 +1,4 @@ PROMPT_COMMAND=bronze_prompt bronze_prompt() { - PS1="$(STATUS=$? JOBS=$(jobs -p | wc -l) bronze print "${BRONZE[@]}") " + PS1="$(status=$? jobs=$(jobs -p | wc -l) bronze print "${BRONZE[@]}") " } diff --git a/init.fish b/init.fish index 27de980..abcc4d6 100644 --- a/init.fish +++ b/init.fish @@ -1 +1 @@ -function fish_prompt; env STATUS=$status JOBS=(count (jobs -p)) CMDTIME={$CMD_DURATION}ms bronze print $BRONZE; echo -n ' '; end +function fish_prompt; env status=$status jobs=(count (jobs -p)) cmdtime={$CMD_DURATION}ms bronze print $BRONZE; echo -n ' '; end diff --git a/init.zsh b/init.zsh index 71e030c..5d66ac7 100644 --- a/init.zsh +++ b/init.zsh @@ -6,5 +6,5 @@ preexec() { } precmd() { - PROMPT="$(env STATUS=$? JOBS=$#jobstates CMDTIME=$(($(date +%s%3N)-$BRONZE_START))ms bronze print "${BRONZE[@]}") " + PROMPT="$(env status=$? jobs=$#jobstates cmdtime=$(($(date +%s%3N)-$BRONZE_START))ms bronze print "${BRONZE[@]}") " } diff --git a/status.go b/status.go index ca2e13f..584fc1c 100644 --- a/status.go +++ b/status.go @@ -20,13 +20,13 @@ func statusSegment(segment *segment) { segment.value += icons["readonly"] } - status, err := strconv.Atoi(os.Getenv("STATUS")) + status, err := strconv.Atoi(os.Getenv("status")) check(err) if status != 0 { segment.value += icons["failed"] } - jobs, err := strconv.Atoi(os.Getenv("JOBS")) + jobs, err := strconv.Atoi(os.Getenv("jobs")) check(err) segment.value += strings.Repeat(icons["job"], jobs) }