From 8db6348644c01fd09f93a8eb8eb8377c4b15aa24 Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Tue, 6 Dec 2016 09:27:59 +0000
Subject: [PATCH] Fix bugs

---
 etc/dbq.php                 | 1 +
 etc/profile.d/docker.sh     | 2 +-
 www/dbq/dbq.php             | 2 +-
 www/dbq/docker-compose.yaml | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/etc/dbq.php b/etc/dbq.php
index 525e3d82..2c5f338e 100644
--- a/etc/dbq.php
+++ b/etc/dbq.php
@@ -19,5 +19,6 @@ foreach ([
   }
 }
 if (!empty($DIR_SQLITE)) $DIR_SQLITE .= '/var/lib/sqlite';
+if (empty($DIR_SQLITE) and file_exists('/var/lib/sqlite')) $DIR_SQLITE = '/var/lib/sqlite';
 
 ?>
diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh
index 3cf72499..509449e5 100644
--- a/etc/profile.d/docker.sh
+++ b/etc/profile.d/docker.sh
@@ -20,7 +20,7 @@ fi
 
 if which docker-compose > /dev/null; then
 docker_compose_up_force() {
-  docker-compose up --force-recreate --build --remove-orphans -d $@
+  docker-compose $@ up --force-recreate --build --remove-orphans -d
 }
 fi
 
diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 09523319..0f4d8d26 100644
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -7,7 +7,7 @@ function dbq_run() {
   if (empty($_SERVER['HTTP_USER_AGENT'])) $_SERVER['HTTP_USER_AGENT'] = '';
   $params = parse_uri([
     'format' => ( preg_match('/^\S+\s+.Windows|iPhone|Android|Macintosh/',$_SERVER['HTTP_USER_AGENT']) ? 'html' : 'human' ),
-    'db' => 'help',
+    'db' => 'ls',
     'table' => 'ls',
     'action' => 'ls',
   ]);
diff --git a/www/dbq/docker-compose.yaml b/www/dbq/docker-compose.yaml
index d4b1e499..f030ce07 100644
--- a/www/dbq/docker-compose.yaml
+++ b/www/dbq/docker-compose.yaml
@@ -11,6 +11,7 @@ services:
       - ./../..:$NB_ROOT
       - /etc/profile.d
       - $HOME/.dbq:/home/www-data/.dbq
+      - $HOME/ownCloud/var/lib/sqlite:/var/lib/sqlite
     entrypoint: sh -c "echo . $NB_ROOT/etc/profile > /etc/profile.d/nb.sh && /usr/local/sbin/php-fpm"
     #entrypoint: "/usr/local/sbin/php-fpm"
 
-- 
2.47.3