Fix bugs

diff --git a/etc/dbq.php b/etc/dbq.php
index 525e3d826367c725b962c60b919140381b3bcce8..2c5f338e5d41c0c6ef6ee1a487d74d4e21401b06 100644 (file)
--- 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 3cf724991364e3255be042b2ab8e44903bd016f5..509449e530272c0ca69e236beafa3f6c97685cea 100644 (file)
--- 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 095233195f06612efa64e570ad32da92a244d67e..0f4d8d26f9c15d338e00a9a77750fb8b7b49434f 100644 (file)
--- 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 d4b1e499f992c0a16489575c95c4d945d4a2d98c..f030ce071413229790c521653d3446c0bade9471 100644 (file)
--- 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"