diff options
Diffstat (limited to 'test/root/root.sh')
-rwxr-xr-x | test/root/root.sh | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/test/root/root.sh b/test/root/root.sh index e8c0ec1ac..a39525b6e 100755 --- a/test/root/root.sh +++ b/test/root/root.sh | |||
@@ -11,8 +11,7 @@ export LC_ALL=C | |||
11 | #******************************** | 11 | #******************************** |
12 | # firecfg | 12 | # firecfg |
13 | #******************************** | 13 | #******************************** |
14 | which less 2>/dev/null | 14 | if command -v less |
15 | if [ "$?" -eq 0 ]; | ||
16 | then | 15 | then |
17 | echo "TESTING: firecfg (test/root/firecfg.exp)" | 16 | echo "TESTING: firecfg (test/root/firecfg.exp)" |
18 | mv /home/netblue/.local/share/applications /home/netblue/.local/share/applications-store | 17 | mv /home/netblue/.local/share/applications /home/netblue/.local/share/applications-store |
@@ -25,24 +24,24 @@ fi | |||
25 | #******************************** | 24 | #******************************** |
26 | # servers | 25 | # servers |
27 | #******************************** | 26 | #******************************** |
28 | if [ -f /etc/init.d/snmpd ] | 27 | if [[ -f /etc/init.d/snmpd ]] |
29 | then | 28 | then |
30 | echo "TESTING: snmpd (test/root/snmpd.exp)" | 29 | echo "TESTING: snmpd (test/root/snmpd.exp)" |
31 | ./snmpd.exp | 30 | ./snmpd.exp |
32 | else | 31 | else |
33 | echo "TESTING SKIP: snmpd not found" | 32 | echo "TESTING SKIP: snmpd not found" |
34 | fi | 33 | fi |
35 | 34 | ||
36 | 35 | ||
37 | if [ -f /etc/init.d/apache2 ] | 36 | if [[ -f /etc/init.d/apache2 ]] |
38 | then | 37 | then |
39 | echo "TESTING: apache2 (test/root/apache2.exp)" | 38 | echo "TESTING: apache2 (test/root/apache2.exp)" |
40 | ./apache2.exp | 39 | ./apache2.exp |
41 | else | 40 | else |
42 | echo "TESTING SKIP: apache2 not found" | 41 | echo "TESTING SKIP: apache2 not found" |
43 | fi | 42 | fi |
44 | 43 | ||
45 | if [ -f /etc/init.d/isc-dhcp-server ] | 44 | if [[ -f /etc/init.d/isc-dhcp-server ]] |
46 | then | 45 | then |
47 | echo "TESTING: isc dhcp server (test/root/isc-dhscp.exp)" | 46 | echo "TESTING: isc dhcp server (test/root/isc-dhscp.exp)" |
48 | ./isc-dhcp.exp | 47 | ./isc-dhcp.exp |
@@ -50,20 +49,20 @@ else | |||
50 | echo "TESTING SKIP: isc dhcp server not found" | 49 | echo "TESTING SKIP: isc dhcp server not found" |
51 | fi | 50 | fi |
52 | 51 | ||
53 | if [ -f /etc/init.d/unbound ] | 52 | if [[ -f /etc/init.d/unbound ]] |
54 | then | 53 | then |
55 | echo "TESTING: unbound (test/root/unbound.exp)" | 54 | echo "TESTING: unbound (test/root/unbound.exp)" |
56 | ./unbound.exp | 55 | ./unbound.exp |
57 | else | 56 | else |
58 | echo "TESTING SKIP: unbound not found" | 57 | echo "TESTING SKIP: unbound not found" |
59 | fi | 58 | fi |
60 | 59 | ||
61 | if [ -f /etc/init.d/nginx ] | 60 | if [[ -f /etc/init.d/nginx ]] |
62 | then | 61 | then |
63 | echo "TESTING: nginx (test/root/nginx.exp)" | 62 | echo "TESTING: nginx (test/root/nginx.exp)" |
64 | ./nginx.exp | 63 | ./nginx.exp |
65 | else | 64 | else |
66 | echo "TESTING SKIP: nginx not found" | 65 | echo "TESTING SKIP: nginx not found" |
67 | fi | 66 | fi |
68 | 67 | ||
69 | #******************************** | 68 | #******************************** |