Merge branch 'ps1' of https://github.com/ldidry/liquidprompt into develop

This commit is contained in:
nojhan 2013-03-12 21:50:07 +01:00
commit 3aee03d3bb
2 changed files with 3 additions and 1 deletions

View File

@ -1325,6 +1325,8 @@ _lp_set_prompt()
esac esac
fi fi
source $LP_PS1_FILE
if [[ -z $LP_PS1 ]] ; then if [[ -z $LP_PS1 ]] ; then
# add title escape time, jobs, load and battery # add title escape time, jobs, load and battery
PS1="${LP_PS1_PREFIX}${LP_TIME}${LP_BATT}${LP_LOAD}${LP_JOBS}" PS1="${LP_PS1_PREFIX}${LP_TIME}${LP_BATT}${LP_LOAD}${LP_JOBS}"

View File

@ -6,7 +6,7 @@
# If you want to use different themes and features, # If you want to use different themes and features,
# you can load the corresponding files here: # you can load the corresponding files here:
#source ~/code/liquidprompt/nojhan.theme #source ~/code/liquidprompt/nojhan.theme
#source ~/code/liquidprompt/nojhan.ps1 #LP_PS1_FILE="~/code/liquidprompt/nojhan.ps1"
############# #############
# BEHAVIOUR # # BEHAVIOUR #