--- tuning-primer.sh.orig Tue Apr 21 16:03:44 2009 +++ tuning-primer.sh Fri Jul 31 19:37:44 2009 @@ -45,34 +45,40 @@ # Argument $1 = message # Argument $2 = color { -export black='\e[0m\c' -export boldblack='\e[1;0m\c' -export red='\e[31m\c' -export boldred='\e[1;31m\c' -export green='\e[32m\c' -export boldgreen='\e[1;32m\c' -export yellow='\e[33m\c' -export boldyellow='\e[1;33m\c' -export blue='\e[34m\c' -export boldblue='\e[1;34m\c' -export magenta='\e[35m\c' -export boldmagenta='\e[1;35m\c' -export cyan='\e[36m\c' -export boldcyan='\e[1;36m\c' -export white='\e[37m\c' -export boldwhite='\e[1;37m\c' + if [ "$OS" != "OpenBSD" ]; then + export black='\e[0m\c' + export boldblack='\e[1;0m\c' + export red='\e[31m\c' + export boldred='\e[1;31m\c' + export green='\e[32m\c' + export boldgreen='\e[1;32m\c' + export yellow='\e[33m\c' + export boldyellow='\e[1;33m\c' + export blue='\e[34m\c' + export boldblue='\e[1;34m\c' + export magenta='\e[35m\c' + export boldmagenta='\e[1;35m\c' + export cyan='\e[36m\c' + export boldcyan='\e[1;36m\c' + export white='\e[37m\c' + export boldwhite='\e[1;37m\c' + fi -local default_msg="No message passed." + local default_msg="No message passed." # Doesn't really need to be a local variable. -message=${1:-$default_msg} # Defaults to default message. -color=${2:-$black} # Defaults to black, if not specified. + message=${1:-$default_msg} # Defaults to default message. + color=${2:-$black} # Defaults to black, if not specified. - echo -e "$color" - echo -e "$message" - tput sgr0 # Reset to normal. - echo -e "$black" - return + if [ "$OS" != "OpenBSD" ]; then + echo -e "$color" + fi + echo -e "$message" + if [ "$OS" != "OpenBSD" ]; then + tput sgr0 # Reset to normal. + echo -e "$black" + fi + return } print_banner () { @@ -1311,7 +1317,7 @@ export mysql_version_num=$($mysql -Bse "SELECT LEFT(REPLACE(SUBSTRING_INDEX(VERSION(), '-', +1), '.', ''),4)" ) mysql_status \'Questions\' questions # socket_owner=$(find -L $socket -printf '%u\n') - socket_owner=$(ls -nH $socket | awk '{ print $3 }') + socket_owner=$(ls -nh $socket | awk '{ print $3 }') } @@ -1325,11 +1331,16 @@ found_socks=$(netstat -ln | awk '/mysql(d)?\.sock/ { print $9 }') export physical_memory=$(sysctl -n hw.memsize) export duflags='' - elif [ "$OS" = 'FreeBSD' ] || [ "$OS" = 'OpenBSD' ]; then + elif [ "$OS" = 'FreeBSD' ]; then ## On FreeBSD must be root to locate sockets. ps_socket=$(netstat -ln | awk '/mysql(d)?\.sock/ { print $9 }' | head -1) found_socks=$(netstat -ln | awk '/mysql(d)?\.sock/ { print $9 }') export physical_memory=$(sysctl -n hw.realmem) + export duflags='' + elif [ "$OS" = 'OpenBSD' ]; then + ps_socket=$(netstat -ln | awk '/mysql(d)?\.sock/ { print $9 }' | head -1) + found_socks=$(netstat -ln | awk '/mysql(d)?\.sock/ { print $9 }') + export physical_memory=$(sysctl -n hw.physmem) export duflags='' elif [ "$OS" = 'Linux' ] ; then ## Includes SWAP