Update how we're checking for python3 during setup, update the python script's shebang
This commit is contained in:
parent
5e47386d23
commit
94c24fdb49
|
|
@ -3,17 +3,21 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
check_command() {
|
check_command() {
|
||||||
if ! command -v "$1" &>/dev/null; then
|
for cmd in "$@"; do
|
||||||
echo "Please install \"$1\" and make sure it's available in your \$PATH, then rerun the setup."
|
if command -v "$cmd" &>/dev/null; then
|
||||||
exit 1
|
return
|
||||||
fi
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "Please install one of the following: ${*}, and make sure it's available in your \$PATH, then rerun the setup."
|
||||||
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
check_command "gnome-extensions"
|
check_command "gnome-extensions"
|
||||||
check_command "glib-compile-schemas"
|
check_command "glib-compile-schemas"
|
||||||
check_command "update-desktop-database"
|
check_command "update-desktop-database"
|
||||||
check_command "gtk-update-icon-cache"
|
check_command "gtk-update-icon-cache"
|
||||||
check_command "python"
|
check_command "python" "python3"
|
||||||
|
|
||||||
# This script gets packaged with the release and should do the bulk of the setup work. This allows this setup to be tied
|
# This script gets packaged with the release and should do the bulk of the setup work. This allows this setup to be tied
|
||||||
# to a specific release of the code, and guarantees it will never run along-side newer or older binaries.
|
# to a specific release of the code, and guarantees it will never run along-side newer or older binaries.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#!@PYTHON@
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
# breezydesktop.in
|
# breezydesktop.in
|
||||||
#
|
#
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue