YUKI Hiroshi
null+****@clear*****
Tue Sep 16 18:53:01 JST 2014
YUKI Hiroshi 2014-09-16 18:53:01 +0900 (Tue, 16 Sep 2014) New Revision: 40aa0a96db1d1c8931d47c7e242e1ff789bfa6b4 https://github.com/droonga/droonga-engine/commit/40aa0a96db1d1c8931d47c7e242e1ff789bfa6b4 Message: Don't show prompt while installation process Modified files: install.sh Modified: install.sh (+17 -9) =================================================================== --- install.sh 2014-09-16 18:32:03 +0900 (a3c7e85) +++ install.sh 2014-09-16 18:53:01 +0900 (30ef3db) @@ -75,9 +75,21 @@ setup_configuration_directory() { if [ ! -e $DROONGA_BASE_DIR/catalog.json -o \ ! -e $DROONGA_BASE_DIR/$NAME.yaml ]; then [ "$HOST" = "Auto Detect" ] && - determine_hostname \ - "Enter a host name or an IP address which is accessible from other nodes for this node" && - HOST=$DETERMINED_HOSTNAME + determine_hostname && + HOST=$DETERMINED_HOSTNAME + + if [ "$HOST" = "" ]; then + HOST=$(hostname) + echo "********************** CAUTION!! **********************" + echo "Installation process coudln't detect the hostname of" + echo "this node, which is accessible from other nodes." + echo "You may have to configure following files manually" + echo "to refer a valid accessible hostname for this node:" + echo "" + echo " $DROONGA_BASE_DIR/catalog.json" + echo " $DROONGA_BASE_DIR/$NAME.yaml" + echo "*******************************************************" + fi fi echo "This node is configured with a hostname $HOST." @@ -112,8 +124,6 @@ guess_global_hostname() { } determine_hostname() { - prompt_for_manual_input="$1" - global_hostname=$(guess_global_hostname) if [ "$global_hostname" != "" ]; then DETERMINED_HOSTNAME="$global_hostname" @@ -130,10 +140,8 @@ determine_hostname() { return 0 fi - input_hostname "$prompt_for_manual_input" && - DETERMINED_HOSTNAME="$TYPED_HOSTNAME" - - return 0 + DETERMINED_HOSTNAME="" + return 1 } input_hostname() { -------------- next part -------------- HTML����������������������������...Download