Wallabag fix user already exists and add License

SynoCommunity · Feb 20, 2021 · b274362 · b274362
1 parent 436045d
commit b274362
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/spk/wallabag/Makefile b/spk/wallabag/Makefile
@@ -17,6 +17,7 @@ CHANGELOG = "Update to 2.4.1, Update to MariaDB10 and php 7.4 using resouce work
 
 HOMEPAGE = https://www.wallabag.org/
 LICENSE  = MIT
+LICENSE_FILE = $(WORK_DIR)/$(SPK_VERS)/COPYING.md
 
 WIZARDS_DIR = src/wizard/
 SERVICE_SETUP = src/service-setup.sh

diff --git a/spk/wallabag/src/conf/resource b/spk/wallabag/src/conf/resource
@@ -11,7 +11,6 @@
             "flag": true,
             "db-name": "wallabag",
             "user-name": "wallabag",
-            "db-collision": "skip",
             "user-pw": "{{wizard_wallabag_password_root}}"
         }
     },

diff --git a/spk/wallabag/src/service-setup.sh b/spk/wallabag/src/service-setup.sh
@@ -35,10 +35,9 @@ service_preinst ()
                 echo "Incorrect MySQL root password"
                 exit 1
             fi
-            if ${MYSQL} -u root -p"${wizard_mysql_password_root}" mysql -e "SELECT User FROM user" | grep ^${MYSQL_USER}$ > /dev/null 2>&1; then
-                echo "MySQL user ${MYSQL_USER} already exists"
-                exit 1
-            fi
+            # if ${MYSQL} -u root -p"${wizard_mysql_password_root}" mysql -e "SELECT User FROM user" | grep ^${MYSQL_USER}$ > /dev/null 2>&1; then
+            #     echo "MySQL user ${MYSQL_USER} already exists"
+            # fi
             # if ${MYSQL} -u root -p"${wizard_mysql_password_root}" -e "SHOW DATABASES" | grep ^${MYSQL_DATABASE}$ > /dev/null 2>&1; then
             #     echo "MySQL database ${MYSQL_DATABASE} already exists"
             #     exit 1