From 4b36d8df2a4801fea6bc0e6b56c42ff0e5f8f470 Mon Sep 17 00:00:00 2001
From: frju365 <win10@tutanota.com>
Date: Thu, 3 Aug 2017 17:24:48 +0200
Subject: [PATCH] [Enh] Upgrade upstream version to 4.7.3 (closes #60) (#61)

* [Fix] upstream_version (#60)
* Version 4.7.3
* Fix upgrade
---
 scripts/upgrade          | 9 ++++++++-
 sources/upstream_version | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index e6e8bd2..67fa5ea 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -53,8 +53,15 @@ sudo tar xzf phpMyAdmin-$version-all-languages.tar.gz -C ../sources/  > /dev/nul
 sudo cp  -r ../sources/phpMyAdmin-$version-all-languages/. "$final_path"
 
 # Update tables
+
+# Handle upgrade from a version before latest version
+# Ignore warnings and failures that will occur if already on latest version
 sudo sed -i "s@phpmyadmin@$db_user@g" $final_path/sql/upgrade_column_info_4_3_0+.sql
-sudo mysql -u $db_user -p$db_pwd < $final_path/sql/upgrade_column_info_4_3_0+.sql
+sudo mysql -u $db_user -p$db_pwd < $final_path/sql/upgrade_column_info_4_3_0+.sql 2>&1 > /dev/null || true
+
+# Upgrade from last version (don't ignore failures)
+sudo sed -i "s@phpmyadmin@$db_user@g" $final_path/sql/upgrade_tables_4_7_0+.sql
+sudo mysql -u $db_user -p$db_pwd < $final_path/sql/upgrade_tables_4_7_0+.sql
 sudo sed -i "s@phpmyadmin@$db_user@g" $final_path/sql/create_tables.sql
 sudo mysql -u $db_user -p$db_pwd < $final_path/sql/create_tables.sql
 
diff --git a/sources/upstream_version b/sources/upstream_version
index ec3f25f..87b18a5 100644
--- a/sources/upstream_version
+++ b/sources/upstream_version
@@ -1 +1 @@
-4.6.6
+4.7.3