From 93cd0d6ac7bf10222a24d2a5d20e08a801e6c97c Mon Sep 17 00:00:00 2001
From: chabad360 <chabad360@gmail.com>
Date: Fri, 5 Oct 2018 04:30:13 +0000
Subject: [PATCH] fixes and tests

fixed travis test, and perm issue
---
 .travis.yml |  5 +++--
 bench       | 38 ++++++++++++++++++++------------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 88fd07c7..5f746e38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,11 @@ services:
   - docker
 
 install:
-  - docker-compose up -d
+  - chmod ugo+x ./bench
+  - ./bench setup docker
   - ./bench init frappe-bench
   - ./bench new-site site1.local
-  - ./bench -c "echo 127.0.0.1   site1.local >> /etc/hosts"
+  - ./bench -c root "echo 127.0.0.1   site1.local >> /etc/hosts"
   - sudo su -c 'echo 127.0.0.1   site1.local >> /etc/hosts'
   - pip install --upgrade virtualenv
   - virtualenv -p python3 testenv
diff --git a/bench b/bench
index a78d7614..1681ff64 100644
--- a/bench
+++ b/bench
@@ -1,19 +1,21 @@
-#!/bin/bash
-
-if [ "$1" == 'init' ]; then
-    docker exec -it root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*"
-    docker exec -it frappe bash -c "bench init frappe-bench --ignore-exist --skip-redis-config-generation && mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json && bench set-mariadb-host mariadb"
-elif [ "$1" == 'setup' && "$2" == 'docker' ]; then
-    if [ "$3" == 'swarm' ]; then
-        echo "Docker swarm mode is not currently supported"
-    else
-        docker-compose up -d
-    fi
-elif [ "$1" == '-c' ]; then
-    shift
-    docker exec -it root frappe bash -c "$@"
-elif [[ $# -eq 0 ]]; then
-    docker exec -it frappe bash
-else
-    docker exec -it frappe bash -c "bench $@"
+#!/bin/bash
+
+if [[ $# -eq 0 ]]; then
+    docker exec -it frappe bash
+elif [ "$1" == 'init' ]; then
+    docker exec -it root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*"
+    docker exec -it frappe bash -c "bench init frappe-bench --ignore-exist --skip-redis-config-generation && mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json && bench set-mariadb-host mariadb"
+elif [ "$1" == 'setup' ] && [ "$2" == 'docker' ]; then
+    if [ "$3" == 'swarm' ]; then
+        echo "Docker swarm mode is not currently supported"
+    else
+        docker-compose up -d
+    fi
+elif [ "$1" == '-c' ]; then
+    shift
+    user=$1
+    shift
+    docker exec -it -u "$user" frappe bash -c "$@"
+else
+    docker exec -it frappe bash -c bench "$@"
 fi
\ No newline at end of file