Skip to content

Commit 9dfe603

Browse files
committed
Adjust some small parts and hide outputs.
1 parent 3ef5e82 commit 9dfe603

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

install/upgrade/manual/upgrade_mariadb.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fi
2020
# Detect operating system and load codename
2121
if [ "$ID" = "ubuntu" ]; then
2222
codename="$(lsb_release -s -c)"
23-
elseif [ "$ID" = "debian" ]; then
23+
elif [ "$ID" = "debian" ]; then
2424
codename="$(cat /etc/os-release |grep VERSION= |cut -f 2 -d \(|cut -f 1 -d \))"
2525
else
2626
echo "Can't detect the os version, cancelling."
@@ -29,12 +29,13 @@ fi
2929

3030
# Installing MariaDB repo
3131
echo "Add new MariaDB repository..."
32+
apt="/etc/apt/sources.list.d/"
3233
if [ "$id" = "ubuntu" ]; then
3334
echo "deb [arch=amd64] http://ams2.mirrors.digitalocean.com/mariadb/repo/$mariadb_v/$ID $codename main" > $apt/mariadb.list
3435
APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 > /dev/null 2>&1
3536
else
3637
echo "deb [arch=amd64] http://ams2.mirrors.digitalocean.com/mariadb/repo/$mariadb_v/$ID $codename main" > $apt/mariadb.list
37-
if [ "$release" -eq 8 ]; then
38+
if [ "$codename" -eq "jessie" ]; then
3839
APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --recv-keys --keyserver keyserver.ubuntu.com CBCB082A1BB943DB > /dev/null 2>&1
3940
else
4041
APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --recv-keys --keyserver keyserver.ubuntu.com F1656F24C74CD1D8 > /dev/null 2>&1
@@ -43,15 +44,15 @@ fi
4344

4445
# Update repository
4546
echo "Update apt repository..."
46-
apt update -qq
47+
apt update -qq > /dev/null 2>&1
4748

4849
# Stop and uninstall mysql server
4950
echo "Stop and remove old MariaDB server..."
5051
systemctl stop mysql > /dev/null 2>&1
51-
apt remove -qq mariadb-server
52+
apt remove -qq mariadb-server -y > /dev/null 2>&1
5253

5354
# Install new version and run upgrader
5455
echo "Installing new MariaDB Server, start and run upgrade..."
55-
apt install -qq mariadb-server
56+
apt install -qq mariadb-server -y > /dev/null 2>&1
5657
systemctl start mysql > /dev/null 2>&1
5758
mysql_upgrade

0 commit comments

Comments
 (0)