YUKI Hiroshi
null+****@clear*****
Wed Sep 24 19:55:54 JST 2014
YUKI Hiroshi 2014-09-24 19:55:54 +0900 (Wed, 24 Sep 2014) New Revision: 4deba29c6b4333e07296a3a9baa7c45b05ca5e05 https://github.com/droonga/droonga-engine/commit/4deba29c6b4333e07296a3a9baa7c45b05ca5e05 Message: Detect host name more correctly Modified files: install.sh Modified: install.sh (+4 -5) =================================================================== --- install.sh 2014-09-24 19:10:55 +0900 (b03b6aa) +++ install.sh 2014-09-24 19:55:54 +0900 (441d617) @@ -75,8 +75,7 @@ setup_configuration_directory() { if [ ! -e $DROONGA_BASE_DIR/catalog.json -o \ ! -e $DROONGA_BASE_DIR/$NAME.yaml ]; then [ "$HOST" = "Auto Detect" ] && - determine_hostname && - HOST=$DETERMINED_HOSTNAME + HOST=$(determine_hostname) if [ "$HOST" = "" ]; then HOST=$(hostname) @@ -116,7 +115,7 @@ guess_global_hostname() { determine_hostname() { global_hostname=$(guess_global_hostname) if [ "$global_hostname" != "" ]; then - DETERMINED_HOSTNAME="$global_hostname" + echo "$global_hostname" return 0 fi @@ -126,11 +125,11 @@ determine_hostname() { -e "s/^ +| +\$//g" |\ cut -d " " -f 1) if [ "$address" != "" ]; then - DETERMINED_HOSTNAME="$address" + echo "$address" return 0 fi - DETERMINED_HOSTNAME="" + echo "" return 1 } -------------- next part -------------- HTML����������������������������...Download
