Просмотр исходного кода

fixed exit code from bash scripts

root 7 месяцев назад
Родитель
Сommit
49488af07f

+ 2 - 0
addons/cmd/ban_client.sh

@@ -97,6 +97,8 @@ main() {
             show_usage
             ;;
     esac
+
+    exit 0
 }
 
 main "$@"

+ 2 - 0
addons/cmd/create_client.sh

@@ -58,3 +58,5 @@ else
     echo "Failed to create user $USERNAME"
     exit 1
 fi
+
+exit 0

+ 2 - 0
addons/cmd/remove_ccd.sh

@@ -56,6 +56,8 @@ main() {
 
     #remove file
     rm -f "${ccd_file}"
+
+    exit 0
 }
 
 main "$@"

+ 2 - 0
addons/cmd/revoke_client.sh

@@ -93,3 +93,5 @@ else
     log "Error: Failed to revoke certificate for $USERNAME"
     exit 1
 fi
+
+exit 0

+ 2 - 0
addons/cmd/show_banned.sh

@@ -51,6 +51,8 @@ main() {
 
     #get banned
     egrep "^disable$" -R "${ccd_dir}"/* | sed 's#.*/##; s/:.*//'
+
+    exit 0
 }
 
 main "$@"

+ 1 - 0
addons/cmd/show_client_ccd.sh

@@ -52,6 +52,7 @@ main() {
     #get client ips
     egrep "^ifconfig-push\s+" "${ccd_dir}"/* | sed 's|.*/||; s/:ifconfig-push / /; s/\([^ ]* [^ ]*\).*/\1/'
 
+    exit 0
 }
 
 main "$@"

+ 1 - 0
addons/cmd/show_client_crt.sh

@@ -102,6 +102,7 @@ main() {
     echo "<key>"
     cat "${KEY_FILE}"
     echo "</key>"
+    exit 0
 }
 
 main "$@"

+ 1 - 2
addons/cmd/show_client_ipp.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -o errexit
-set -o nounset
 set -o pipefail
 
 show_usage() {
@@ -52,6 +50,7 @@ main() {
     #get client ips
     cat "${ipp_file}" | sed 's/,$//'
 
+    exit 0
 }
 
 main "$@"

+ 0 - 2
addons/cmd/show_index.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -o errexit
-set -o nounset
 set -o pipefail
 
 show_usage() {

+ 5 - 4
addons/cmd/show_servers_crt.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -o errexit
-set -o nounset
 set -o pipefail
 
 show_usage() {
@@ -47,12 +45,15 @@ main() {
         username=$(basename "${cert}" | sed 's/\.[^.]*$//')
 	CN=$(echo "$openssl_output" | grep 'subject=' | sed 's/.*CN=//;s/,.*//')
         # Проверяем расширения из одного вывода openssl
-	if echo "$openssl_output" | grep -q "TLS Web Server Authentication\|serverAuth" || 
-    	    echo "$openssl_output" | grep -q "SSL server : Yes"; then
+#	if echo "$openssl_output" | grep -q "TLS Web Server Authentication\|serverAuth" ||
+#    	    echo "$openssl_output" | grep -q "SSL server : Yes"; then
+	if echo "$openssl_output" | grep -q "TLS Web Server Authentication\|serverAuth"; then
+
             echo "$username"
 	    [ "${username}" != "${CN}" ] && echo "$CN"
 	    fi
     done
+    exit 0
 }
 
 main "$@"