Fix "does not exist" (#4938)

bin/v-add-user-package

@@ -109,7 +109,7 @@ else
 fi
 
 if [ ! -f "$tmpfile" ]; then
-	echo "$tmpfile does not exists"
+	echo "$tmpfile does not exist"
 	exit "$E_NOTEXIST"
 fi
 

bin/v-change-user-theme

@@ -37,7 +37,7 @@ is_object_unsuspended 'user' 'USER' "$user"
 themes=$($BIN/v-list-sys-themes plain)
 
 if ! echo "$themes" | grep -q -x "$theme"; then
-	echo "Theme does not exists"
+	echo "Theme does not exist"
 	exit "$E_NOTEXIST"
 fi
 

bin/v-export-rrd

@@ -85,7 +85,7 @@ function generate_mysql_table() {
 			XPORT:a:Queries \
 			XPORT:s:Slow
 	else
-		echo "Does not exists"
+		echo "Does not exist"
 		exit 1
 	fi
 }
@@ -98,7 +98,7 @@ function generate_pgsql_table() {
 			XPORT:a:Queries \
 			XPORT:t:Transactions
 	else
-		echo "Does not exists"
+		echo "Does not exist"
 		exit 1
 	fi
 }
@@ -117,7 +117,7 @@ function generate_net_table() {
 			XPORT:inoctets:"Input (rx)" \
 			XPORT:outoctets:"Output (tx)"
 	else
-		echo "Does not exists"
+		echo "Does not exist"
 		exit 1
 	fi
 }
@@ -193,9 +193,8 @@ case $chart in
 		generate_net_table
 		;;
 
-	\
-		*)
-		echo "Does not exists"
+	*)
+		echo "Does not exist"
 		exit 1
 		;;
 esac

bin/v-import-cpanel

@@ -44,7 +44,7 @@ fi
 if [ -z "$BACKUP_TEMP" ]; then
 	BACKUP_TEMP=$BACKUP
 else
-	echo "File does not exists"
+	echo "File does not exist"
 	exit 1
 fi
 
@@ -302,7 +302,7 @@ for ssl_domain in apache_tls/*; do
             block_count++;
             cert_file = "apache_tls/ssl/" ssl_domain "/" ssl_domain ".crt";
             print "-----BEGIN CERTIFICATE-----" $0 > cert_file;
-        } 
+        }
         NR>2 {
             block_count++;
             cert_file = "apache_tls/ssl/" ssl_domain "/" ssl_domain ".ca";

bin/v-import-directadmin

@@ -43,7 +43,7 @@ fi
 if [ -z "$BACKUP_TEMP" ]; then
 	BACKUP_TEMP=$BACKUP
 else
-	echo "File does not exists"
+	echo "File does not exist"
 	exit 1
 fi
 

test/test.bats

@@ -465,7 +465,7 @@ function check_ip_not_banned(){
   refute_output
 }
 
-@test "User: Change user language (Does not exists)" {
+@test "User: Change user language (Does not exist)" {
   run v-change-user-language $user "aa"
   assert_failure $E_NOTEXIST
 }
@@ -482,7 +482,7 @@ function check_ip_not_banned(){
   refute_output
 }
 
-@test "User: Change user theme (Does not exists)" {
+@test "User: Change user theme (Does not exist)" {
   run v-change-user-theme $user "aa"
   assert_failure $E_NOTEXIST
 }

test/test_helper/bats-file

@@ -1 +1 @@
-Subproject commit 17fa557f6fe28a327933e3fa32efef1d211caa5a
+Subproject commit 8fd3b7fa22a91278f21b107dab1855678fe549e0