Merge 9acc234c6d into 9a524b4329
This commit is contained in:
commit
58e4759291
|
|
@ -13,6 +13,7 @@ if [ $? -ne 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#DO NOT EDIT THESE LINES use --help to get the current list of options
|
||||||
export USE_SWITCH_SOURCE=false
|
export USE_SWITCH_SOURCE=false
|
||||||
export USE_SWITCH_PACKAGE_ALL=false
|
export USE_SWITCH_PACKAGE_ALL=false
|
||||||
export USE_SWITCH_PACKAGE_UNOFFICIAL_ARM=false
|
export USE_SWITCH_PACKAGE_UNOFFICIAL_ARM=false
|
||||||
|
|
|
||||||
29
install.sh
29
install.sh
|
|
@ -3,6 +3,8 @@
|
||||||
# 1 general error
|
# 1 general error
|
||||||
# 2 unsupported OS
|
# 2 unsupported OS
|
||||||
# 3 unsupported CPU/OS bits
|
# 3 unsupported CPU/OS bits
|
||||||
|
# note all command line options are passed onto the relevant installer
|
||||||
|
# except --diag which will cause this script to output the diag info and exit
|
||||||
|
|
||||||
verbose () {
|
verbose () {
|
||||||
echo "${green}$1${normal}"
|
echo "${green}$1${normal}"
|
||||||
|
|
@ -43,6 +45,33 @@ fi
|
||||||
#Make ourselves executable next time we are run
|
#Make ourselves executable next time we are run
|
||||||
chmod +x $0
|
chmod +x $0
|
||||||
|
|
||||||
|
#Check if the user has requested diag
|
||||||
|
ARGS=$(getopt -n 'install.sh' -o h -l diag -- "$@")
|
||||||
|
DIAG=false
|
||||||
|
while true; do
|
||||||
|
case "$1" in
|
||||||
|
--diag ) export DIAG=true; shift ;;
|
||||||
|
-- ) shift; break ;;
|
||||||
|
* ) break ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
if [ $DIAG = true ]; then
|
||||||
|
verbose "Diagnostic information:-";
|
||||||
|
echo "=> lsb_release -a <="
|
||||||
|
lsb_release -a
|
||||||
|
echo
|
||||||
|
echo "=> cat/proc/cpu <="
|
||||||
|
cat /proc/cpu
|
||||||
|
echo
|
||||||
|
echo
|
||||||
|
echo "=> uname -a <="
|
||||||
|
uname -a
|
||||||
|
echo
|
||||||
|
verbose "For IRC please place this information in http://pastebin.com"
|
||||||
|
verbose "For Github Issues/PRs please paste inside a code segment (`example`)"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
#Os/Distro Check
|
#Os/Distro Check
|
||||||
os_check=$(lsb_release -is)
|
os_check=$(lsb_release -is)
|
||||||
check_major_release=$(lsb_release -rs | cut -d. -f1)
|
check_major_release=$(lsb_release -rs | cut -d. -f1)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue