Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Auto-selects python2 if available in the environment #15

Merged
merged 1 commit into from
May 7, 2015
Merged

Auto-selects python2 if available in the environment #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,24 @@ for opt in "$@"; do
fi
done

PYTHONCMD="python"
if type python2 > /dev/null; then
PYTHONCMD="python2"
fi

# we need to handle the --help option outside the python
# flow since otherwise we will move into input selection...
for opt in "$@"; do
if [ "$opt" == "--help" -o "$opt" == "-h" ]; then
python "$BASEDIR/src/printHelp.py"
$PYTHONCMD "$BASEDIR/src/printHelp.py"
exit 0
fi
done

# process input from pipe and store as pickled file
python "$BASEDIR/src/processInput.py"
$PYTHONCMD "$BASEDIR/src/processInput.py"
# now choose input and...
exec 0<&-
python "$BASEDIR/src/choose.py" < /dev/tty
$PYTHONCMD "$BASEDIR/src/choose.py" < /dev/tty
# execute the output bash script
sh ~/.fbPager.sh < /dev/tty