Update v1.2.4

litespeedtech · Aug 22, 2013 · fa1c013 · fa1c013
1 parent 7be40a7
commit fa1c013
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dist/functions.sh b/dist/functions.sh
@@ -280,7 +280,6 @@ EOF
 
 
 # generate password file
-
 		ENCRYPT_PASS=`"$LSINSTALL_DIR/admin/fcgi-bin/admin_php" -q "$LSINSTALL_DIR/admin/misc/htpasswd.php" $PASS_ONE`
 		echo "$ADMIN_USER:$ENCRYPT_PASS" > "$LSINSTALL_DIR/admin/conf/htpasswd"
 

diff --git a/dist/install.sh b/dist/install.sh
@@ -141,9 +141,10 @@ else
     chmod "$EXEC_MOD" "$LSWS_HOME/admin/fcgi-bin/admin_php"
 fi
 
-ENCRYPT_PASS=`"$LSWS_HOME/admin/fcgi-bin/admin_php" -q "$LSWS_HOME/admin/misc/htpasswd.php" $PASS_ONE`
-echo "$ADMIN_USER:$ENCRYPT_PASS" > "$LSWS_HOME/admin/conf/htpasswd"
-
+if [ ! -f "$LSWS_HOME/admin/conf/htpasswd" ] ; then
+    ENCRYPT_PASS=`"$LSWS_HOME/admin/fcgi-bin/admin_php" -q "$LSWS_HOME/admin/misc/htpasswd.php" $PASS_ONE`
+    echo "$ADMIN_USER:$ENCRYPT_PASS" > "$LSWS_HOME/admin/conf/htpasswd"
+fi
 
 
 if [ -f "$LSWS_HOME/fcgi-bin/lsphp" ]; then
Original file line number	Diff line number	Diff line change
Expand Up		@@ -280,7 +280,6 @@ EOF


		# generate password file

		ENCRYPT_PASS=`"$LSINSTALL_DIR/admin/fcgi-bin/admin_php" -q "$LSINSTALL_DIR/admin/misc/htpasswd.php" $PASS_ONE`
		echo "$ADMIN_USER:$ENCRYPT_PASS" > "$LSINSTALL_DIR/admin/conf/htpasswd"

Expand Down