Skip to content

Switch to python3 by default: Issue #305 #307

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

Merged
pcottle merged 1 commit into from
Aug 30, 2019
Merged

Switch to python3 by default: Issue #305 #307

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
6 changes: 3 additions & 3 deletions fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ while [ -h "$SOURCE" ]; do
done
BASEDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"

PYTHONCMD="python"
PYTHONCMD="python3"
NONINTERACTIVE=false

# Setup according to XDG/Freedesktop standards as specified by
Expand Down Expand Up @@ -73,8 +73,8 @@ for opt in "$@"; do
VERSION="$($PYTHONCMD "$BASEDIR/src/version.py")"
echo "fpp version $VERSION"
exit 0
elif [ "$opt" == "--python3" ]; then
PYTHONCMD="python3"
elif [ "$opt" == "--python2" ]; then
PYTHONCMD="python2"
elif [ "$opt" == "--help" -o "$opt" == "-h" ]; then
$PYTHONCMD "$BASEDIR/src/printHelp.py"
exit 0
Expand Down