Raphael Schneeberger 4 лет назад
Родитель
Сommit
677de3dffd
2 измененных файлов с 7 добавлено и 7 удалено
  1. 3 3
      install/hst-install-debian.sh
  2. 4 4
      install/hst-install-ubuntu.sh

+ 3 - 3
install/hst-install-debian.sh

@@ -630,7 +630,7 @@ fi
 mask1='(([[:alnum:]](-?[[:alnum:]])*)\.)'
 mask2='*[[:alnum:]](-?[[:alnum:]])+\.[[:alnum:]]{2,}'
 if ! [[ "$servername" =~ ^${mask1}${mask2}$ ]]; then
-    if [ -n "$servername" ]; then
+    if [[ -n "$servername" ]]; then
         servername="$servername.example.com"
     else
         servername="example.com"
@@ -638,12 +638,12 @@ if ! [[ "$servername" =~ ^${mask1}${mask2}$ ]]; then
     echo "127.0.0.1 $servername" >> /etc/hosts
 fi
 
-if [ -z $(grep -i "$servername" /etc/hosts) ]; then
+if [[ -z $(grep -i "$servername" /etc/hosts) ]]; then
   echo "127.0.0.1 $servername" >> /etc/hosts
 fi
 
 # Set email if it wasn't set
-if [ -z "$email" ]; then
+if [[ -z "$email" ]]; then
     email="admin@$servername"
 fi
 

+ 4 - 4
install/hst-install-ubuntu.sh

@@ -602,7 +602,7 @@ fi
 mask1='(([[:alnum:]](-?[[:alnum:]])*)\.)'
 mask2='*[[:alnum:]](-?[[:alnum:]])+\.[[:alnum:]]{2,}'
 if ! [[ "$servername" =~ ^${mask1}${mask2}$ ]]; then
-    if [ -n "$servername" ]; then
+    if [[ -n "$servername" ]]; then
         servername="$servername.example.com"
     else
         servername="example.com"
@@ -610,12 +610,12 @@ if ! [[ "$servername" =~ ^${mask1}${mask2}$ ]]; then
     echo "127.0.0.1 $servername" >> /etc/hosts
 fi
 
-if [ -z $(grep -i "$servername" /etc/hosts) ];  then
-  echo "127.0.0.1 $servername" >> /etc/hosts
+if [[ -z $(grep -i "$servername" /etc/hosts) ]]; then
+    echo "127.0.0.1 $servername" >> /etc/hosts
 fi
 
 # Set email if it wasn't set
-if [ -z "$email" ]; then
+if [[ -z "$email" ]]; then
     email="admin@$servername"
 fi