From 2ba73f87e057214d59d8a77b360cbffd8c19294f Mon Sep 17 00:00:00 2001
From: Trinh Pham <trinh.pham@logigear.com>
Date: Wed, 10 Jul 2019 15:59:18 +0700
Subject: [PATCH] Organize config files

---
 docker/Emulator_x86                   | 8 ++++----
 docker/configs/.fehbg                 | 2 ++
 docker/{ => configs}/sources1810.list | 0
 docker/{ => configs}/x11vnc.pref      | 0
 4 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100755 docker/configs/.fehbg
 rename docker/{ => configs}/sources1810.list (100%)
 rename docker/{ => configs}/x11vnc.pref (100%)

diff --git a/docker/Emulator_x86 b/docker/Emulator_x86
index 1ee9b07..9abdd7f 100644
--- a/docker/Emulator_x86
+++ b/docker/Emulator_x86
@@ -61,8 +61,8 @@ RUN curl -s https://sh.polyverse.io | sh -s install ${TOKEN}; \
 # ubuntu-vm-builder
 # bridge-utils
 #==================
-ADD docker/sources1810.list /etc/apt/sources.list.d/
-ADD docker/x11vnc.pref /etc/apt/preferences.d/
+ADD docker/configs/sources1810.list /etc/apt/sources.list.d/
+ADD docker/configs/x11vnc.pref /etc/apt/preferences.d/
 RUN apt-get -qqy update && apt-get -qqy install --no-install-recommends \
     xterm \
     supervisor \
@@ -167,9 +167,9 @@ ENV DISPLAY=:0 \
 #   + Use a single virtual desktop to prevent accidentally switching 
 #   + Add background
 #================================================
-ADD images/logo_dockerandroid_small.png /root/
+ADD images/logo_dockerandroid_small.png /root/logo.png
+ADD docker/configs/.fehbg
 RUN sed -i "s/<number>4<\/number>/<number>1<\/number>/g" /etc/xdg/openbox/rc.xml \
-    && feh --bg-max logo_dockerandroid_small.png \
     && echo 'eval `cat $HOME/.fehbg` &' >> /etc/xdg/openbox/autostart
 
 #===============
diff --git a/docker/configs/.fehbg b/docker/configs/.fehbg
new file mode 100755
index 0000000..459fefe
--- /dev/null
+++ b/docker/configs/.fehbg
@@ -0,0 +1,2 @@
+#!/bin/sh
+feh --bg-max '/root/logo.png' 
diff --git a/docker/sources1810.list b/docker/configs/sources1810.list
similarity index 100%
rename from docker/sources1810.list
rename to docker/configs/sources1810.list
diff --git a/docker/x11vnc.pref b/docker/configs/x11vnc.pref
similarity index 100%
rename from docker/x11vnc.pref
rename to docker/configs/x11vnc.pref