Skip to content
Snippets Groups Projects
Commit 63542b07 authored by Bob Mottram's avatar Bob Mottram
Browse files

Fix xmpp creation of tables and indexes

parent 20a6f997
No related branches found
No related tags found
No related merge requests found
...@@ -67,6 +67,21 @@ xmpp_variables=(ONION_ONLY ...@@ -67,6 +67,21 @@ xmpp_variables=(ONION_ONLY
DEFAULT_DOMAIN_NAME DEFAULT_DOMAIN_NAME
XMPP_DOMAIN_CODE) XMPP_DOMAIN_CODE)
function xmpp_fix_exists {
if ! grep -q "CREATE INDEX IF NOT EXISTS" plugins/mod_storage_sql1.lua; then
sed -i 's|CREATE INDEX|CREATE INDEX IF NOT EXISTS|g' plugins/mod_storage_sql1.lua
fi
if ! grep -q "CREATE INDEX IF NOT EXISTS" util/sql.lua; then
sed -i 's|CREATE INDEX|CREATE INDEX IF NOT EXISTS|g' util/sql.lua
fi
if ! grep -q "CREATE TABLE IF NOT EXISTS" plugins/mod_storage_sql1.lua; then
sed -i 's|CREATE TABLE|CREATE TABLE IF NOT EXISTS|g' plugins/mod_storage_sql1.lua
fi
if ! grep -q "CREATE TABLE IF NOT EXISTS" util/sql.lua; then
sed -i 's|CREATE TABLE|CREATE TABLE IF NOT EXISTS|g' util/sql.lua
fi
}
function xmpp_update_e2e_policy { function xmpp_update_e2e_policy {
filename="$1" filename="$1"
...@@ -505,6 +520,7 @@ function upgrade_xmpp { ...@@ -505,6 +520,7 @@ function upgrade_xmpp {
# ensure that the binaries have not been overwritten # ensure that the binaries have not been overwritten
# by an operating system upgrade # by an operating system upgrade
cd "${INSTALL_DIR}/${prosody_filename}" || exit 462846284 cd "${INSTALL_DIR}/${prosody_filename}" || exit 462846284
xmpp_fix_exists
make prefix=/usr install make prefix=/usr install
else else
cd "$INSTALL_DIR" || exit 23681468 cd "$INSTALL_DIR" || exit 23681468
...@@ -532,6 +548,7 @@ function upgrade_xmpp { ...@@ -532,6 +548,7 @@ function upgrade_xmpp {
tar -xzvf "${INSTALL_DIR}/${prosody_filename}.tar.gz" tar -xzvf "${INSTALL_DIR}/${prosody_filename}.tar.gz"
cd "${INSTALL_DIR}/${prosody_filename}" || exit 246872468246 cd "${INSTALL_DIR}/${prosody_filename}" || exit 246872468246
xmpp_fix_exists
./configure --ostype=debian --prefix=/usr ./configure --ostype=debian --prefix=/usr
make prefix=/usr make prefix=/usr
make prefix=/usr install make prefix=/usr install
...@@ -973,6 +990,7 @@ function install_xmpp_nightly { ...@@ -973,6 +990,7 @@ function install_xmpp_nightly {
tar -xzvf "${INSTALL_DIR}/${prosody_filename}.tar.gz" tar -xzvf "${INSTALL_DIR}/${prosody_filename}.tar.gz"
cd "${INSTALL_DIR}/${prosody_filename}" || exit 7246284245 cd "${INSTALL_DIR}/${prosody_filename}" || exit 7246284245
xmpp_fix_exists
./configure --ostype=debian --prefix=/usr ./configure --ostype=debian --prefix=/usr
make prefix=/usr make prefix=/usr
make prefix=/usr install make prefix=/usr install
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment