Skip to content

Commit 08747b3

Browse files
authored
Fix "does not exist" (hestiacp#4938)
1 parent 0eb5ad8 commit 08747b3

File tree

7 files changed

+13
-14
lines changed

7 files changed

+13
-14
lines changed

bin/v-add-user-package

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ else
109109
fi
110110

111111
if [ ! -f "$tmpfile" ]; then
112-
echo "$tmpfile does not exists"
112+
echo "$tmpfile does not exist"
113113
exit "$E_NOTEXIST"
114114
fi
115115

bin/v-change-user-theme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ is_object_unsuspended 'user' 'USER' "$user"
3737
themes=$($BIN/v-list-sys-themes plain)
3838

3939
if ! echo "$themes" | grep -q -x "$theme"; then
40-
echo "Theme does not exists"
40+
echo "Theme does not exist"
4141
exit "$E_NOTEXIST"
4242
fi
4343

bin/v-export-rrd

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function generate_mysql_table() {
8585
XPORT:a:Queries \
8686
XPORT:s:Slow
8787
else
88-
echo "Does not exists"
88+
echo "Does not exist"
8989
exit 1
9090
fi
9191
}
@@ -98,7 +98,7 @@ function generate_pgsql_table() {
9898
XPORT:a:Queries \
9999
XPORT:t:Transactions
100100
else
101-
echo "Does not exists"
101+
echo "Does not exist"
102102
exit 1
103103
fi
104104
}
@@ -117,7 +117,7 @@ function generate_net_table() {
117117
XPORT:inoctets:"Input (rx)" \
118118
XPORT:outoctets:"Output (tx)"
119119
else
120-
echo "Does not exists"
120+
echo "Does not exist"
121121
exit 1
122122
fi
123123
}
@@ -193,9 +193,8 @@ case $chart in
193193
generate_net_table
194194
;;
195195

196-
\
197-
*)
198-
echo "Does not exists"
196+
*)
197+
echo "Does not exist"
199198
exit 1
200199
;;
201200
esac

bin/v-import-cpanel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fi
4444
if [ -z "$BACKUP_TEMP" ]; then
4545
BACKUP_TEMP=$BACKUP
4646
else
47-
echo "File does not exists"
47+
echo "File does not exist"
4848
exit 1
4949
fi
5050

@@ -302,7 +302,7 @@ for ssl_domain in apache_tls/*; do
302302
block_count++;
303303
cert_file = "apache_tls/ssl/" ssl_domain "/" ssl_domain ".crt";
304304
print "-----BEGIN CERTIFICATE-----" $0 > cert_file;
305-
}
305+
}
306306
NR>2 {
307307
block_count++;
308308
cert_file = "apache_tls/ssl/" ssl_domain "/" ssl_domain ".ca";

bin/v-import-directadmin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fi
4343
if [ -z "$BACKUP_TEMP" ]; then
4444
BACKUP_TEMP=$BACKUP
4545
else
46-
echo "File does not exists"
46+
echo "File does not exist"
4747
exit 1
4848
fi
4949

test/test.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ function check_ip_not_banned(){
465465
refute_output
466466
}
467467

468-
@test "User: Change user language (Does not exists)" {
468+
@test "User: Change user language (Does not exist)" {
469469
run v-change-user-language $user "aa"
470470
assert_failure $E_NOTEXIST
471471
}
@@ -482,7 +482,7 @@ function check_ip_not_banned(){
482482
refute_output
483483
}
484484

485-
@test "User: Change user theme (Does not exists)" {
485+
@test "User: Change user theme (Does not exist)" {
486486
run v-change-user-theme $user "aa"
487487
assert_failure $E_NOTEXIST
488488
}

test/test_helper/bats-file

0 commit comments

Comments
 (0)