From 5b2abf4441beec473b49f20f63cccfaddab8d056 Mon Sep 17 00:00:00 2001 From: 0xmachos <0xmachos@gmail.com> Date: Fri, 9 Mar 2018 13:30:34 +0000 Subject: [PATCH] Convert OS detection steps to function --- install | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/install b/install index d249c4335..7365c2580 100755 --- a/install +++ b/install @@ -34,6 +34,24 @@ read -p "Are you sure you wish to continue (Y/n)? " if [ "`echo ${REPLY} | tr [:upper:] [:lower:]`" = "n" ] ; then fatal 'Installation aborted' fi +check_os () { + + info "Detecting OS..." + + OS=$(uname) + readonly OS + info "Operating System: $OS" + if [ "${OS}" = "Linux" ] ; then + info "Launching Linux install..." + install_linux + elif [ "${OS}" = "Darwin" ]; then + info "Launching Mac OSX install..." + install_mac + else + fatal "Unable to locate installer for your Operating system: $OS" + fi +} + install_linux () { info "Detecting Linux OS distribution..." @@ -68,20 +86,6 @@ install_mac () { echo } -info "Detecting OS..." -OS=`uname` -readonly OS -info "Operating System: $OS" -if [ "${OS}" = "Linux" ] ; then - info "Launching Linux install..." - install_linux -elif [ "$OS" = "Darwin" ]; then - info "Launching Mac OSX install..." - install_mac -else - fatal "Unable to locate installer for your Operating system: $OS" -fi - check_ruby_version () {