Kouhei Sutou
null+****@clear*****
Fri Sep 5 12:02:39 JST 2014
Kouhei Sutou 2014-09-05 12:02:39 +0900 (Fri, 05 Sep 2014) New Revision: a0b785ef120d75e08df902600e974f469d756793 https://github.com/droonga/droonga-engine/commit/a0b785ef120d75e08df902600e974f469d756793 Message: Call id in exist_user() Because exist_user() already exists. Modified files: script/install-master.sh script/install.sh Modified: script/install-master.sh (+4 -3) =================================================================== --- script/install-master.sh 2014-09-05 11:04:23 +0900 (2dea1f3) +++ script/install-master.sh 2014-09-05 12:02:39 +0900 (5bfc520) @@ -18,12 +18,13 @@ USER=droonga-engine DROONGA_BASE_DIR=/home/$USER/droonga exist_user() { - grep "^$1:" /etc/passwd > /dev/null + id "$1" > /dev/null 2>&1 } prepare_user() { - id $USER - [ ! $? -eq 0 ] && useradd -m $USER + if ! exist_user $USER; then + useradd -m $USER + fi } setup_configuration_directory() { Modified: script/install.sh (+4 -3) =================================================================== --- script/install.sh 2014-09-05 11:04:23 +0900 (f9334eb) +++ script/install.sh 2014-09-05 12:02:39 +0900 (458bcd6) @@ -18,12 +18,13 @@ USER=droonga-engine DROONGA_BASE_DIR=/home/$USER/droonga exist_user() { - grep "^$1:" /etc/passwd > /dev/null + id "$1" > /dev/null 2>&1 } prepare_user() { - id $USER - [ ! $? -eq 0 ] && useradd -m $USER + if ! exist_user $USER; then + useradd -m $USER + fi } setup_configuration_directory() { -------------- next part -------------- HTML����������������������������...Download