diff --git a/spk/fengoffice/src/installer.sh b/spk/fengoffice/src/installer.sh index 24d499f10de..71f436a6888 100755 --- a/spk/fengoffice/src/installer.sh +++ b/spk/fengoffice/src/installer.sh @@ -9,9 +9,9 @@ VERSION="2.5.1.2" INSTALL_DIR="/usr/local/${PACKAGE}" SSS="/var/packages/${PACKAGE}/scripts/start-stop-status" WEB_DIR="/var/services/web" -MYSQL="/usr/syno/mysql/bin/mysql" -MYSQLDUMP="/usr/syno/mysql/bin/mysqldump" USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)" +MYSQL="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysql || echo -n /usr/syno/mysql/bin/mysql)" +MYSQLDUMP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysqldump || echo -n /usr/syno/mysql/bin/mysqldump)"ump" MYSQL_USER="fengoffice" MYSQL_DATABASE="fengoffice" TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp" diff --git a/spk/ffsync/src/installer.sh b/spk/ffsync/src/installer.sh index 8a59bcb6fb4..7b3a8ba775c 100755 --- a/spk/ffsync/src/installer.sh +++ b/spk/ffsync/src/installer.sh @@ -18,8 +18,8 @@ FWPORTS="/var/packages/${PACKAGE}/scripts/${PACKAGE}.sc" USER="ffsync" GROUP="nobody" -MYSQL="/usr/syno/mysql/bin/mysql" -MYSQLDUMP="/usr/syno/mysql/bin/mysqldump" +MYSQL="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysql || echo -n /usr/syno/mysql/bin/mysql)" +MYSQLDUMP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysqldump || echo -n /usr/syno/mysql/bin/mysqldump)" INI_FILE="${INSTALL_DIR}/var/ffsync.ini" TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp" diff --git a/spk/horde/src/installer.sh b/spk/horde/src/installer.sh index 4168b1dae07..6050bbd2d96 100755 --- a/spk/horde/src/installer.sh +++ b/spk/horde/src/installer.sh @@ -9,9 +9,9 @@ PACKAGE_NAME="com.synocommunity.packages.${PACKAGE}" INSTALL_DIR="/usr/local/${PACKAGE}" SSS="/var/packages/${PACKAGE}/scripts/start-stop-status" WEB_DIR="/var/services/web" -MYSQL="/usr/syno/mysql/bin/mysql" -MYSQLDUMP="/usr/syno/mysql/bin/mysqldump" USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)" +MYSQL="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysql || echo -n /usr/syno/mysql/bin/mysql)" +MYSQLDUMP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysqldump || echo -n /usr/syno/mysql/bin/mysqldump)" MYSQL_USER="horde" MYSQL_DATABASE="horde" TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp" diff --git a/spk/mantisbt/src/installer.sh b/spk/mantisbt/src/installer.sh index 1bba455cf9f..66c4da714ac 100755 --- a/spk/mantisbt/src/installer.sh +++ b/spk/mantisbt/src/installer.sh @@ -8,9 +8,9 @@ PACKAGE_NAME="com.synocommunity.packages.${PACKAGE}" # Others INSTALL_DIR="/usr/local/${PACKAGE}" WEB_DIR="/var/services/web" -MYSQL="/usr/syno/mysql/bin/mysql" -MYSQLDUMP="/usr/syno/mysql/bin/mysqldump" USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)" +MYSQL="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysql || echo -n /usr/syno/mysql/bin/mysql)" +MYSQLDUMP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysqldump || echo -n /usr/syno/mysql/bin/mysqldump)" MYSQL_USER="mantisbt" MYSQL_DATABASE="mantisbt" TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp" diff --git a/spk/newznab/src/installer.sh b/spk/newznab/src/installer.sh index 59949d36294..8e8a9b5bb94 100755 --- a/spk/newznab/src/installer.sh +++ b/spk/newznab/src/installer.sh @@ -8,9 +8,9 @@ DNAME="Newznab" INSTALL_DIR="/usr/local/${PACKAGE}" SSS="/var/packages/${PACKAGE}/scripts/start-stop-status" WEB_DIR="/var/services/web" -MYSQL="/usr/syno/mysql/bin/mysql" -MYSQLDUMP="/usr/syno/mysql/bin/mysqldump" USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)" +MYSQL="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysql || echo -n /usr/syno/mysql/bin/mysql)" +MYSQLDUMP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysqldump || echo -n /usr/syno/mysql/bin/mysqldump)" MYSQL_USER="newznab" MYSQL_DATABASE="newznab" TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp" diff --git a/spk/owncloud/src/installer.sh b/spk/owncloud/src/installer.sh index 5a79a427e03..d407dbb28b6 100755 --- a/spk/owncloud/src/installer.sh +++ b/spk/owncloud/src/installer.sh @@ -8,9 +8,9 @@ PACKAGE_NAME="com.synocommunity.packages.${PACKAGE}" # Others INSTALL_DIR="/usr/local/${PACKAGE}" WEB_DIR="/var/services/web" -MYSQL="/usr/syno/mysql/bin/mysql" -MYSQLDUMP="/usr/syno/mysql/bin/mysqldump" USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)" +MYSQL="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysql || echo -n /usr/syno/mysql/bin/mysql)" +MYSQLDUMP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysqldump || echo -n /usr/syno/mysql/bin/mysqldump)" MYSQL_USER="owncloud" MYSQL_DATABASE="owncloud" TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp" diff --git a/spk/roundcube/src/installer.sh b/spk/roundcube/src/installer.sh index 88f34cd5156..6357a695284 100755 --- a/spk/roundcube/src/installer.sh +++ b/spk/roundcube/src/installer.sh @@ -7,9 +7,9 @@ DNAME="Roundcube Webmail" # Others INSTALL_DIR="/usr/local/${PACKAGE}" WEB_DIR="/var/services/web" -MYSQL="/usr/syno/mysql/bin/mysql" -MYSQLDUMP="/usr/syno/mysql/bin/mysqldump" USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)" +MYSQL="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysql || echo -n /usr/syno/mysql/bin/mysql)" +MYSQLDUMP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysqldump || echo -n /usr/syno/mysql/bin/mysqldump)" MYSQL_USER="roundcube" MYSQL_DATABASE="roundcube" TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp" diff --git a/spk/selfoss/src/installer.sh b/spk/selfoss/src/installer.sh index d1890a7a10f..b7079252db2 100755 --- a/spk/selfoss/src/installer.sh +++ b/spk/selfoss/src/installer.sh @@ -8,9 +8,9 @@ DNAME="Selfoss" INSTALL_DIR="/usr/local/${PACKAGE}" SSS="/var/packages/${PACKAGE}/scripts/start-stop-status" WEB_DIR="/var/services/web" -MYSQL="/usr/syno/mysql/bin/mysql" -MYSQLDUMP="/usr/syno/mysql/bin/mysqldump" USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)" +MYSQL="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysql || echo -n /usr/syno/mysql/bin/mysql)" +MYSQLDUMP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysqldump || echo -n /usr/syno/mysql/bin/mysqldump)" MYSQL_USER="selfoss" MYSQL_DATABASE="selfoss" TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp" diff --git a/spk/tt-rss/src/installer.sh b/spk/tt-rss/src/installer.sh index f23fdfcf697..c12507d7296 100755 --- a/spk/tt-rss/src/installer.sh +++ b/spk/tt-rss/src/installer.sh @@ -10,8 +10,8 @@ SSS="/var/packages/${PACKAGE}/scripts/start-stop-status" WEB_DIR="/var/services/web" USER="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 4418 ] && echo -n http || echo -n nobody)" PHP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /usr/local/bin/php56 || echo -n /usr/bin/php)" -MYSQL="/usr/syno/mysql/bin/mysql" -MYSQLDUMP="/usr/syno/mysql/bin/mysqldump" +MYSQL="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysql || echo -n /usr/syno/mysql/bin/mysql)" +MYSQLDUMP="$([ $(/bin/get_key_value /etc.defaults/VERSION buildnumber) -ge 7135 ] && echo -n /bin/mysqldump || echo -n /usr/syno/mysql/bin/mysqldump)" MYSQL_USER="ttrss" MYSQL_DATABASE="ttrss" TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp"