Do not hardcode scripts/powerline in input.*

This commit is contained in:
ZyX 2014-08-02 21:27:31 +04:00
parent f3d972849e
commit 9da3e04bc2
8 changed files with 27 additions and 18 deletions

View File

@ -1,8 +1,9 @@
POWERLINE_COMMAND="$PWD/scripts/powerline -p $PWD/powerline/config_files" export VIRTUAL_ENV=
source powerline/bindings/bash/powerline.sh
POWERLINE_COMMAND="$POWERLINE_COMMAND -p $PWD/powerline/config_files"
POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false" POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false"
POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly" POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly"
export VIRTUAL_ENV= cd tests/shell/3rd
source powerline/bindings/bash/powerline.sh ; cd tests/shell/3rd
cd .git cd .git
cd .. cd ..
VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment" VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"

View File

@ -1,8 +1,9 @@
POWERLINE_COMMAND="$PWD/scripts/powerline -p $PWD/powerline/config_files" . powerline/bindings/shell/powerline.sh
POWERLINE_COMMAND="$POWERLINE_COMMAND -p $PWD/powerline/config_files"
POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false" POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false"
POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly" POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly"
export VIRTUAL_ENV= export VIRTUAL_ENV=
. powerline/bindings/shell/powerline.sh ; cd tests/shell/3rd cd tests/shell/3rd
cd .git cd .git
cd .. cd ..
VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment" VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"

View File

@ -1,8 +1,9 @@
POWERLINE_COMMAND="$PWD/scripts/powerline -p $PWD/powerline/config_files" . powerline/bindings/shell/powerline.sh
POWERLINE_COMMAND="$POWERLINE_COMMAND -p $PWD/powerline/config_files"
POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false" POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false"
POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly" POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly"
export VIRTUAL_ENV= export VIRTUAL_ENV=
. powerline/bindings/shell/powerline.sh ; cd tests/shell/3rd cd tests/shell/3rd
cd .git cd .git
cd .. cd ..
VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment" VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"

View File

@ -1,9 +1,10 @@
set POWERLINE_COMMAND "$PWD/scripts/powerline -p $PWD/powerline/config_files" set fish_function_path $fish_function_path "$PWD/powerline/bindings/fish"
powerline-setup
set POWERLINE_COMMAND "$POWERLINE_COMMAND -p $PWD/powerline/config_files"
set POWERLINE_COMMAND "$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false" set POWERLINE_COMMAND "$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false"
set POWERLINE_COMMAND "$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly" set POWERLINE_COMMAND "$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly"
setenv VIRTUAL_ENV setenv VIRTUAL_ENV
set fish_function_path $fish_function_path "$PWD/powerline/bindings/fish" cd tests/shell/3rd
powerline-setup ; cd tests/shell/3rd
cd .git cd .git
cd .. cd ..
setenv VIRTUAL_ENV "$HOME/.virtenvs/some-virtual-environment" setenv VIRTUAL_ENV "$HOME/.virtenvs/some-virtual-environment"

View File

@ -1,8 +1,9 @@
POWERLINE_COMMAND="$PWD/scripts/powerline -p $PWD/powerline/config_files" . powerline/bindings/shell/powerline.sh
POWERLINE_COMMAND="$POWERLINE_COMMAND -p $PWD/powerline/config_files"
POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false" POWERLINE_COMMAND="$POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false"
POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly" POWERLINE_COMMAND="$POWERLINE_COMMAND -c ext.shell.theme=default_leftonly"
export VIRTUAL_ENV= export VIRTUAL_ENV=
. powerline/bindings/shell/powerline.sh ; cd tests/shell/3rd cd tests/shell/3rd
cd .git cd .git
cd .. cd ..
VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment" VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"

View File

@ -1,6 +1,7 @@
setenv POWERLINE_COMMAND $PWD:q/scripts/powerline" -p "$PWD:q/powerline/config_files" -t default_leftonly.segment_data.hostname.args.only_if_ssh=false -c ext.shell.theme=default_leftonly" source powerline/bindings/tcsh/powerline.tcsh
setenv POWERLINE_COMMAND "$POWERLINE_COMMAND -p "$PWD:q/powerline/config_files" -t default_leftonly.segment_data.hostname.args.only_if_ssh=false -c ext.shell.theme=default_leftonly"
unsetenv VIRTUAL_ENV unsetenv VIRTUAL_ENV
source powerline/bindings/tcsh/powerline.tcsh ; cd tests/shell/3rd cd tests/shell/3rd
cd .git cd .git
cd .. cd ..
setenv VIRTUAL_ENV $HOME:q"/.virtenvs/some-virtual-environment" setenv VIRTUAL_ENV $HOME:q"/.virtenvs/some-virtual-environment"

View File

@ -1,14 +1,15 @@
unsetopt promptsp transientrprompt unsetopt promptsp transientrprompt
POWERLINE_COMMAND=( $PWD/scripts/powerline -p $PWD/powerline/config_files )
POWERLINE_COMMAND=( $POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false )
POWERLINE_COMMAND=( $POWERLINE_COMMAND -c ext.shell.theme=default_leftonly )
setopt interactivecomments setopt interactivecomments
# POWERLINE_CONFIG_PATH=$PWD/powerline/config_files # POWERLINE_CONFIG_PATH=$PWD/powerline/config_files
# POWERLINE_THEME_CONFIG=( default_leftonly.segment_data.hostname.args.only_if_ssh=false ) # POWERLINE_THEME_CONFIG=( default_leftonly.segment_data.hostname.args.only_if_ssh=false )
# POWERLINE_CONFIG=( ext.shell.theme=default_leftonly ) # POWERLINE_CONFIG=( ext.shell.theme=default_leftonly )
POWERLINE_NO_ZSH_ZPYTHON=1 # TODO: make tests work with zsh/zpython POWERLINE_NO_ZSH_ZPYTHON=1 # TODO: make tests work with zsh/zpython
source powerline/bindings/zsh/powerline.zsh
POWERLINE_COMMAND=( $POWERLINE_COMMAND -p $PWD/powerline/config_files )
POWERLINE_COMMAND=( $POWERLINE_COMMAND -t default_leftonly.segment_data.hostname.args.only_if_ssh=false )
POWERLINE_COMMAND=( $POWERLINE_COMMAND -c ext.shell.theme=default_leftonly )
export VIRTUAL_ENV= export VIRTUAL_ENV=
source powerline/bindings/zsh/powerline.zsh ; cd tests/shell/3rd cd tests/shell/3rd
cd .git cd .git
cd .. cd ..
VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment" VIRTUAL_ENV="$HOME/.virtenvs/some-virtual-environment"

View File

@ -127,6 +127,8 @@ unset ENV
powerline-daemon -k || true powerline-daemon -k || true
sleep 1s sleep 1s
scripts/powerline-config shell command
for TEST_TYPE in "daemon" "nodaemon" ; do for TEST_TYPE in "daemon" "nodaemon" ; do
if test $TEST_TYPE == daemon ; then if test $TEST_TYPE == daemon ; then
sh -c 'echo $$ > tests/shell/daemon_pid; ./scripts/powerline-daemon -f &>tests/shell/daemon_log' & sh -c 'echo $$ > tests/shell/daemon_pid; ./scripts/powerline-daemon -f &>tests/shell/daemon_log' &