From 02f0cbe3539ede171958645ba9d524d4edc7f2e8 Mon Sep 17 00:00:00 2001 From: Joren Van Onder Date: Wed, 26 Aug 2015 11:05:29 +0200 Subject: [PATCH] [IMP] point_of_sale: keep as many scripts as possible in the odoo repo This way we don't require a new image when we want to change eg. the odoo configuration file. --- addons/hw_posbox_upgrade/controllers/main.py | 2 +- .../home/pi => configuration}/led_status.sh | 0 .../{overwrite_before_init/home/pi => configuration}/odoo.conf | 0 .../home/pi => configuration}/posbox_update.sh | 0 .../etc => configuration}/setup_ramdisks.sh | 0 .../tools/posbox/overwrite_after_init/etc/init.d/rcS | 2 +- .../tools/posbox/overwrite_after_init/etc/rc.local | 2 +- .../tools/posbox/overwrite_before_init/etc/init.d/odoo | 2 +- addons/point_of_sale/tools/posbox/posbox_create_image.sh | 1 + 9 files changed, 5 insertions(+), 4 deletions(-) rename addons/point_of_sale/tools/posbox/{overwrite_before_init/home/pi => configuration}/led_status.sh (100%) rename addons/point_of_sale/tools/posbox/{overwrite_before_init/home/pi => configuration}/odoo.conf (100%) rename addons/point_of_sale/tools/posbox/{overwrite_before_init/home/pi => configuration}/posbox_update.sh (100%) rename addons/point_of_sale/tools/posbox/{overwrite_after_init/etc => configuration}/setup_ramdisks.sh (100%) diff --git a/addons/hw_posbox_upgrade/controllers/main.py b/addons/hw_posbox_upgrade/controllers/main.py index cec93510e83..42811820e74 100644 --- a/addons/hw_posbox_upgrade/controllers/main.py +++ b/addons/hw_posbox_upgrade/controllers/main.py @@ -104,7 +104,7 @@ class PosboxUpgrader(hw_proxy.Proxy): def perform_upgrade(self): self.upgrading.acquire() - os.system('/home/pi/posbox_update.sh') + os.system('/home/pi/odoo/addons/point_of_sale/tools/posbox/configuration/posbox_update.sh') self.upgrading.release() return 'SUCCESS' diff --git a/addons/point_of_sale/tools/posbox/overwrite_before_init/home/pi/led_status.sh b/addons/point_of_sale/tools/posbox/configuration/led_status.sh similarity index 100% rename from addons/point_of_sale/tools/posbox/overwrite_before_init/home/pi/led_status.sh rename to addons/point_of_sale/tools/posbox/configuration/led_status.sh diff --git a/addons/point_of_sale/tools/posbox/overwrite_before_init/home/pi/odoo.conf b/addons/point_of_sale/tools/posbox/configuration/odoo.conf similarity index 100% rename from addons/point_of_sale/tools/posbox/overwrite_before_init/home/pi/odoo.conf rename to addons/point_of_sale/tools/posbox/configuration/odoo.conf diff --git a/addons/point_of_sale/tools/posbox/overwrite_before_init/home/pi/posbox_update.sh b/addons/point_of_sale/tools/posbox/configuration/posbox_update.sh similarity index 100% rename from addons/point_of_sale/tools/posbox/overwrite_before_init/home/pi/posbox_update.sh rename to addons/point_of_sale/tools/posbox/configuration/posbox_update.sh diff --git a/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/setup_ramdisks.sh b/addons/point_of_sale/tools/posbox/configuration/setup_ramdisks.sh similarity index 100% rename from addons/point_of_sale/tools/posbox/overwrite_after_init/etc/setup_ramdisks.sh rename to addons/point_of_sale/tools/posbox/configuration/setup_ramdisks.sh diff --git a/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/init.d/rcS b/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/init.d/rcS index 6380e949834..4d32107fac8 100755 --- a/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/init.d/rcS +++ b/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/init.d/rcS @@ -5,6 +5,6 @@ # Call all S??* scripts in /etc/rcS.d/ in numerical/alphabetical order # -/etc/setup_ramdisks.sh +/home/pi/odoo/addons/point_of_sale/tools/posbox/configuration/setup_ramdisks.sh exec /etc/init.d/rc S diff --git a/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/rc.local b/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/rc.local index 065b6a05f77..dab16e3b415 100755 --- a/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/rc.local +++ b/addons/point_of_sale/tools/posbox/overwrite_after_init/etc/rc.local @@ -20,6 +20,6 @@ fi mkdir -p /var/run/odoo chown pi:pi /var/run/odoo -/home/pi/led_status.sh & +/home/pi/odoo/addons/point_of_sale/tools/posbox/configuration/led_status.sh & exit 0 diff --git a/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init.d/odoo b/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init.d/odoo index 9bdaa86c584..f9bc0400abc 100755 --- a/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init.d/odoo +++ b/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init.d/odoo @@ -17,7 +17,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin DAEMON=/home/pi/odoo/odoo.py NAME=odoo DESC=odoo -CONFIG=/home/pi/odoo.conf +CONFIG=/home/pi/odoo/addons/point_of_sale/tools/posbox/configuration/odoo.conf LOGFILE=/var/log/odoo/odoo-server.log PIDFILE=/var/run/${NAME}.pid USER=pi diff --git a/addons/point_of_sale/tools/posbox/posbox_create_image.sh b/addons/point_of_sale/tools/posbox/posbox_create_image.sh index 9e65410f8fe..5b860c65043 100755 --- a/addons/point_of_sale/tools/posbox/posbox_create_image.sh +++ b/addons/point_of_sale/tools/posbox/posbox_create_image.sh @@ -35,6 +35,7 @@ git config core.sparsecheckout true echo "addons/web addons/web_kanban addons/hw_* +addons/point_of_sale/tools/posbox/configuration openerp/ odoo.py" | tee --append .git/info/sparse-checkout > /dev/null git read-tree -mu HEAD