Skip to content

Commit d2c27b3

Browse files
authored
check for both adminer or adminneo
Signed-off-by: enoch85 <[email protected]>
1 parent 6253d4b commit d2c27b3

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

apps/adminneo.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ debug_mode
2020
root_check
2121

2222
# Check if adminneo is already installed
23-
if ! is_this_installed adminneo
23+
if ! is_this_installed adminer && [ ! -f "$ADMINNEODIR/adminneo.php" ]
2424
then
2525
# Ask for installing
2626
install_popup "$SCRIPT_NAME"
@@ -44,9 +44,9 @@ else
4444
rm -f /etc/apache2/sites-available/adminer.conf
4545
rm -f /etc/apache2/sites-enabled/adminer.conf
4646
rm -rf /usr/share/adminer
47+
check_command apt-get purge adminer -y
4748
fi
4849

49-
check_command apt-get purge adminneo -y
5050
restart_webserver
5151
# Show successful uninstall if applicable
5252
removal_popup "$SCRIPT_NAME"
@@ -64,10 +64,6 @@ a2enmod headers
6464
a2enmod rewrite
6565
a2enmod ssl
6666

67-
# Install AdminNeo
68-
apt-get update -q4 & spinner_loading
69-
install_if_not adminneo
70-
7167
# The legacy Evo project has been archived, switching to AdminNeo (www.adminneo.org)
7268
# See: https://github.com/adminneo-org/adminneo
7369
print_text_in_color "$ICyan" "Downloading AdminNeo version ${ADMINNEO_VERSION}..."

0 commit comments

Comments
 (0)