diff --git a/setup.sh b/setup.sh index be57134..acbb808 100755 --- a/setup.sh +++ b/setup.sh @@ -5,8 +5,11 @@ # by Clayton Slaughter and William Young # # clayton.thomas.slaughter@ibm.com # # william.young@ibm.com # +# Version: 04.01ga10 # ################################################################################ +echo C3270 Installer Script Version: 04.01ga10 + # Make sure script is run as root if [[ $UID -ne 0 ]]; then echo "This script must be run as root. Please run:\nsudo $0" @@ -17,7 +20,6 @@ fi macver=$(/usr/bin/sw_vers -productVersion) xcode_fooler=/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress - # Define the xcode install function install_xcode () { touch $xcode_fooler @@ -26,7 +28,7 @@ install_xcode () { softwareupdate -i $install_candidate fi rm $xcode_fooler - if [[ ${macver:3} -gt 13 ]]; then + if [[ ${macver:0:2} -gt 10 || ${macver:3} -gt 13 ]]; then if [[ ! -f /Library/Developer/CommandLineTools/usr/bin/git ]]; then echo "Xcode tools could not be installed automatically"; echo "please run 'xcode-select --install' manually to install the Xcode Command Line Tools, then rerun this script."; @@ -45,7 +47,7 @@ install_xcode () { echo "Checking for Xcode..." # Get Xcode if needed -if [[ ${macver:3} -gt 13 ]]; then +if [[ ${macver:0:2} -gt 10 || ${macver:3} -gt 13 ]]; then if [[ ! -f /Library/Developer/CommandLineTools/usr/bin/git ]]; then install_xcode fi @@ -65,8 +67,8 @@ wrkdir=$(mktemp -d) cd $wrkdir echo "Building in $PWD" # Grab the source code -curl http://x3270.bgp.nu/download/03.06/suite3270-3.6ga8-src.tgz | tar -x -cd suite3270-3.6 +curl http://x3270.bgp.nu/download/04.01/suite3270-4.1ga10-src.tgz | tar -x +cd suite3270-4.1 # Build and install ./configure --enable-c3270 @@ -86,4 +88,4 @@ if [[ $1 == "noclean" ]]; then echo $wrkdir exit 0 fi -rm -rf $wrkdir \ No newline at end of file +rm -rf $wrkdir