Skip to content

Commit 01d1168

Browse files
authored
Update all.bats
1 parent 4981582 commit 01d1168

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

.github/jobs/configure-checks/all.bats

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ fi
1919

2020
translate () {
2121
args="$@"
22+
if [ "$distro_id" = 'ID="opensuse-leap"' ]; then
23+
args=${args/g++/gcc-c++}
24+
fi
2225
if [ "$distro_id" = "ID=fedora" ] || [ "$distro_id" = 'ID="opensuse-leap"' ]; then
2326
args=${args/libcgroup-dev/libcgroup-devel}
2427
fi
@@ -46,6 +49,9 @@ setup() {
4649
if [ "$distro_id" = "ID=fedora" ]; then
4750
repo-install httpd
4851
fi
52+
if [ "$distro_id" = 'ID="opensuse-leap"' ]; then
53+
repo-install apache2
54+
fi
4955
repo-install gcc g++ libcgroup-dev composer
5056
}
5157

@@ -58,13 +64,19 @@ repo-install () {
5864
if [ "$distro_id" = "ID=arch" ]; then
5965
${cmd} $args -Sy --noconfirm >/dev/null
6066
else
61-
${cmd} install $args -y >/dev/null
67+
${cmd} install -y $args >/dev/null
6268
fi
6369
}
6470

6571
repo-remove () {
6672
args=$(translate $@)
67-
${cmd} remove $args -y #>/dev/null
73+
if [ "$distro_id" = 'ID="opensuse-leap"' ]; then
74+
${cmd} remove -y $args >/dev/null || ret="$?"
75+
if [ "$ret" -ne "104" ]; then
76+
return $?
77+
fi
78+
else
79+
${cmd} remove -y $args #>/dev/null
6880
if [ "$distro_id" != "ID=fedora" ]; then
6981
apt-get autoremove -y 2>/dev/null
7082
fi

0 commit comments

Comments
 (0)