bussybox bug, prepare to move from owncloud to dropbox

diff --git a/README.md b/README.md
index bfb7592a524873f1aec3ced5c37d0b521af12389..54d3fc2892848baa36e0c7ce510cf01108905e88 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
-nb
+NodeBoot
 =============
 
 ## Synopsis
 
-Main library
+NodeBoot main library
+
+Copyright (c) 2015 - Nicolas Boisselier <nicolas.boisselier@gmail.com>

diff --git a/etc/dbq.php b/etc/dbq.php
index 2c5f338e5d41c0c6ef6ee1a487d74d4e21401b06..181e91acb826901e64070072bfb9228840425d4a 100644 (file)
--- a/etc/dbq.php
+++ b/etc/dbq.php
@@ -11,6 +11,8 @@ unset($DIR_SQLITE);
 foreach ([
   '/home/nico/ownCloud',
   '/Users/nico/ownCloud',
+  '/home/nico/Dropbox',
+  '/Users/nico/Dropbox',
 ] as $DIR_SQLITE) {
   if (is_readable($DIR_SQLITE)) {
     break;

diff --git a/etc/profile b/etc/profile
index 0aaf6d615563dc65895eca39559dfe2896131690..c9281033f0ef8c07f0cdf9cb1735fa45d8d643ad 100755 (executable)
--- a/etc/profile
+++ b/etc/profile
@@ -77,6 +77,7 @@ else
       ${NB_ROOT}/etc/profile.d/aliases \
       $(nb_repo "etc/profile" "etc/profile.d/*.sh" | grep -vFx "${NB_ROOT}/etc/profile") \
     ;do
+#unset i tmp NB_CURRENT_DIR NB_DEBUG NB_LOOP; return
       [ -n "$NB_DEBUG" ] && $NB_DEBUG "OK: . $i"
       [ -r "$i" -a -f "$i" ] && . "$i"
     done

diff --git a/etc/profile.d/docker.sh b/etc/profile.d/docker.sh
index 509449e530272c0ca69e236beafa3f6c97685cea..b4040c26e0368d93b17939046b75185bfae32a1e 100644 (file)
--- a/etc/profile.d/docker.sh
+++ b/etc/profile.d/docker.sh
@@ -5,6 +5,7 @@ which docker > /dev/null || return 0
 
 [ -z "$DOCKER_MACHINE_NAME" ] && DOCKER_MACHINE_NAME="docker"
 [ -d ~/ownCloud/Docker ] && export DOCKER_HOME=~/ownCloud/Docker
+[ -d ~/ownCloud/Docker ] && export DOCKER_HOME=~/Dropbox/Docker
 [ -z "$DOCKER_HUB" ] && DOCKER_HUB=""
 
 # Docker env only if `is_prompt` !!!

diff --git a/etc/profile.d/functions b/etc/profile.d/functions
index 43dbcbd83568bd61102c47456fb6e29626932a4e..0b2245be68d3faf5a9a6f519cf9c987b3939d2bb 100644 (file)
--- a/etc/profile.d/functions
+++ b/etc/profile.d/functions
@@ -31,8 +31,9 @@ else
             \
             /home/*/code/*/.nb-install \
             /Users/*/code/*/.nb-install \
-          2>/dev/null | xargs -n1 dirname \
+          2>/dev/null \
         ); do
+          dir=$(dirname "$dir")
           realpath "$dir"
         done
       )

diff --git a/etc/profile.d/git.sh b/etc/profile.d/git.sh
index c688336599e64e11b82e1e9d60c82141ae3ebfa4..de74b713edff9cd3f0c988819f47960aaa398452 100644 (file)
--- a/etc/profile.d/git.sh
+++ b/etc/profile.d/git.sh
@@ -163,3 +163,4 @@ git_conn_check() {
 
   return 0
 }
+

diff --git a/etc/profile.d/nb.sh b/etc/profile.d/nb.sh
index e612d2d7d787f294353698a3797603ffdbf0138d..6bbc64f0ce95abc7c7fed5c9fb517d14ae4ccaa5 100644 (file)
--- a/etc/profile.d/nb.sh
+++ b/etc/profile.d/nb.sh
@@ -16,6 +16,10 @@ nb_repos_commit_push() {
   cd "$pwd"
 }
 
+nb_auth() {
+  curl -ku nico https://nico.nbdom.net/private/auth/
+}
+
 nb_repos_status() {
   shell_help "List repos git status" "$@" && return
   local status
@@ -32,10 +36,6 @@ nb_repos_status() {
   cd "$pwd"
 }
 
-nb_auth() {
-  curl -ku nico https://nico.nbdom.net/private/auth/
-}
-
 nb_mails() {
   printf '| 1-$ cat\nx\n' | mail | perl -MDate::Manip -MEncode -ne '
 BEGIN {

diff --git a/www/dbq/docker-compose.yaml b/www/dbq/docker-compose.yaml
index f030ce071413229790c521653d3446c0bade9471..d659add603d9333dcebb01d539342d4197186403 100644 (file)
--- a/www/dbq/docker-compose.yaml
+++ b/www/dbq/docker-compose.yaml
@@ -11,7 +11,8 @@ services:
       - ./../..:$NB_ROOT
       - /etc/profile.d
       - $HOME/.dbq:/home/www-data/.dbq
-      - $HOME/ownCloud/var/lib/sqlite:/var/lib/sqlite
+      - $HOME/$DOCKER_HOME/var/lib/sqlite:/var/lib/sqlite
+      #- $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"