From 97563a69fed0ca2e662b3cf42ae4a207e93dee3e Mon Sep 17 00:00:00 2001
From: Temur Vibliani <tvibliani@delta-comm.ge>
Date: Mon, 21 Sep 2015 18:13:34 +0400
Subject: [PATCH 1/9] [IMP] Readability fix

 - Replaced ECHO sequence with a CAT command.

 On branch v9_enhance_script_readability
 Changes to be committed:
	modified:   V9/odoo_install.sh
---
 V9/odoo_install.sh | 142 +++++++++++++++++++++++----------------------
 1 file changed, 72 insertions(+), 70 deletions(-)

diff --git a/V9/odoo_install.sh b/V9/odoo_install.sh
index 5d128a1..4769fb4 100644
--- a/V9/odoo_install.sh
+++ b/V9/odoo_install.sh
@@ -128,76 +128,78 @@ sudo chmod 755 $OE_HOME_EXT/start.sh
 #--------------------------------------------------
 
 echo -e "* Create init file"
-echo '#!/bin/sh' >> ~/$OE_CONFIG
-echo '### BEGIN INIT INFO' >> ~/$OE_CONFIG
-echo '# Provides: $OE_CONFIG' >> ~/$OE_CONFIG
-echo '# Required-Start: $remote_fs $syslog' >> ~/$OE_CONFIG
-echo '# Required-Stop: $remote_fs $syslog' >> ~/$OE_CONFIG
-echo '# Should-Start: $network' >> ~/$OE_CONFIG
-echo '# Should-Stop: $network' >> ~/$OE_CONFIG
-echo '# Default-Start: 2 3 4 5' >> ~/$OE_CONFIG
-echo '# Default-Stop: 0 1 6' >> ~/$OE_CONFIG
-echo '# Short-Description: Enterprise Business Applications' >> ~/$OE_CONFIG
-echo '# Description: ODOO Business Applications' >> ~/$OE_CONFIG
-echo '### END INIT INFO' >> ~/$OE_CONFIG
-echo 'PATH=/bin:/sbin:/usr/bin' >> ~/$OE_CONFIG
-echo "DAEMON=$OE_HOME_EXT/openerp-server" >> ~/$OE_CONFIG
-echo "NAME=$OE_CONFIG" >> ~/$OE_CONFIG
-echo "DESC=$OE_CONFIG" >> ~/$OE_CONFIG
-echo '' >> ~/$OE_CONFIG
-echo '# Specify the user name (Default: odoo).' >> ~/$OE_CONFIG
-echo "USER=$OE_USER" >> ~/$OE_CONFIG
-echo '' >> ~/$OE_CONFIG
-echo '# Specify an alternate config file (Default: /etc/openerp-server.conf).' >> ~/$OE_CONFIG
-echo "CONFIGFILE=\"/etc/$OE_CONFIG.conf\"" >> ~/$OE_CONFIG
-echo '' >> ~/$OE_CONFIG
-echo '# pidfile' >> ~/$OE_CONFIG
-echo 'PIDFILE=/var/run/$NAME.pid' >> ~/$OE_CONFIG
-echo '' >> ~/$OE_CONFIG
-echo '# Additional options that are passed to the Daemon.' >> ~/$OE_CONFIG
-echo 'DAEMON_OPTS="-c $CONFIGFILE"' >> ~/$OE_CONFIG
-echo '[ -x $DAEMON ] || exit 0' >> ~/$OE_CONFIG
-echo '[ -f $CONFIGFILE ] || exit 0' >> ~/$OE_CONFIG
-echo 'checkpid() {' >> ~/$OE_CONFIG
-echo '[ -f $PIDFILE ] || return 1' >> ~/$OE_CONFIG
-echo 'pid=`cat $PIDFILE`' >> ~/$OE_CONFIG
-echo '[ -d /proc/$pid ] && return 0' >> ~/$OE_CONFIG
-echo 'return 1' >> ~/$OE_CONFIG
-echo '}' >> ~/$OE_CONFIG
-echo '' >> ~/$OE_CONFIG
-echo 'case "${1}" in' >> ~/$OE_CONFIG
-echo 'start)' >> ~/$OE_CONFIG
-echo 'echo -n "Starting ${DESC}: "' >> ~/$OE_CONFIG
-echo 'start-stop-daemon --start --quiet --pidfile ${PIDFILE} \' >> ~/$OE_CONFIG
-echo '--chuid ${USER} --background --make-pidfile \' >> ~/$OE_CONFIG
-echo '--exec ${DAEMON} -- ${DAEMON_OPTS}' >> ~/$OE_CONFIG
-echo 'echo "${NAME}."' >> ~/$OE_CONFIG
-echo ';;' >> ~/$OE_CONFIG
-echo 'stop)' >> ~/$OE_CONFIG
-echo 'echo -n "Stopping ${DESC}: "' >> ~/$OE_CONFIG
-echo 'start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \' >> ~/$OE_CONFIG
-echo '--oknodo' >> ~/$OE_CONFIG
-echo 'echo "${NAME}."' >> ~/$OE_CONFIG
-echo ';;' >> ~/$OE_CONFIG
-echo '' >> ~/$OE_CONFIG
-echo 'restart|force-reload)' >> ~/$OE_CONFIG
-echo 'echo -n "Restarting ${DESC}: "' >> ~/$OE_CONFIG
-echo 'start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \' >> ~/$OE_CONFIG
-echo '--oknodo' >> ~/$OE_CONFIG
-echo 'sleep 1' >> ~/$OE_CONFIG
-echo 'start-stop-daemon --start --quiet --pidfile ${PIDFILE} \' >> ~/$OE_CONFIG
-echo '--chuid ${USER} --background --make-pidfile \' >> ~/$OE_CONFIG
-echo '--exec ${DAEMON} -- ${DAEMON_OPTS}' >> ~/$OE_CONFIG
-echo 'echo "${NAME}."' >> ~/$OE_CONFIG
-echo ';;' >> ~/$OE_CONFIG
-echo '*)' >> ~/$OE_CONFIG
-echo 'N=/etc/init.d/${NAME}' >> ~/$OE_CONFIG
-echo 'echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2' >> ~/$OE_CONFIG
-echo 'exit 1' >> ~/$OE_CONFIG
-echo ';;' >> ~/$OE_CONFIG
-echo '' >> ~/$OE_CONFIG
-echo 'esac' >> ~/$OE_CONFIG
-echo 'exit 0' >> ~/$OE_CONFIG
+cat <<EOF > ~/$OE_CONFIG
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: $OE_CONFIG
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# Should-Start: $network
+# Should-Stop: $network
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Enterprise Business Applications
+# Description: ODOO Business Applications
+### END INIT INFO
+PATH=/bin:/sbin:/usr/bin
+DAEMON=$OE_HOME_EXT/openerp-server
+NAME=$OE_CONFIG
+DESC=$OE_CONFIG
+
+# Specify the user name (Default: odoo).
+USER=$OE_USER
+
+# Specify an alternate config file (Default: /etc/openerp-server.conf).
+CONFIGFILE="/etc/$OE_CONFIG.conf"
+
+# pidfile
+PIDFILE=/var/run/$NAME.pid
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS="-c $CONFIGFILE"
+[ -x $DAEMON ] || exit 0
+[ -f $CONFIGFILE ] || exit 0
+checkpid() {
+[ -f $PIDFILE ] || return 1
+pid=`cat $PIDFILE`
+[ -d /proc/$pid ] && return 0
+return 1
+}
+
+case "${1}" in
+start)
+echo -n "Starting ${DESC}: "
+start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
+--chuid ${USER} --background --make-pidfile \
+--exec ${DAEMON} -- ${DAEMON_OPTS}
+echo "${NAME}."
+;;
+stop)
+echo -n "Stopping ${DESC}: "
+start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \
+--oknodo
+echo "${NAME}."
+;;
+
+restart|force-reload)
+echo -n "Restarting ${DESC}: "
+start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \
+--oknodo
+sleep 1
+start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
+--chuid ${USER} --background --make-pidfile \
+--exec ${DAEMON} -- ${DAEMON_OPTS}
+echo "${NAME}."
+;;
+*)
+N=/etc/init.d/${NAME}
+echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2
+exit 1
+;;
+
+esac
+exit 0
+EOF
 
 echo -e "* Security Init File"
 sudo mv ~/$OE_CONFIG /etc/init.d/$OE_CONFIG

From df555719680d789214185819f66e03faa770fad4 Mon Sep 17 00:00:00 2001
From: Temur Vibliani <tvibliani@delta-comm.ge>
Date: Mon, 21 Sep 2015 18:32:21 +0400
Subject: [PATCH 2/9] Escape init startup variables

---
 V9/odoo_install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/V9/odoo_install.sh b/V9/odoo_install.sh
index 4769fb4..b694912 100644
--- a/V9/odoo_install.sh
+++ b/V9/odoo_install.sh
@@ -132,10 +132,10 @@ cat <<EOF > ~/$OE_CONFIG
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides: $OE_CONFIG
-# Required-Start: $remote_fs $syslog
-# Required-Stop: $remote_fs $syslog
-# Should-Start: $network
-# Should-Stop: $network
+# Required-Start: \$remote_fs \$syslog
+# Required-Stop: \$remote_fs \$syslog
+# Should-Start: \$network
+# Should-Stop: \$network
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 # Short-Description: Enterprise Business Applications

From 17b1b176980f59e7d9fafb5e51514defcf34493c Mon Sep 17 00:00:00 2001
From: Temur Vibliani <tvibliani@delta-comm.ge>
Date: Mon, 21 Sep 2015 18:46:05 +0400
Subject: [PATCH 3/9] escape internal variables of the script

---
 V9/odoo_install.sh | 50 +++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/V9/odoo_install.sh b/V9/odoo_install.sh
index b694912..c0e1e8b 100644
--- a/V9/odoo_install.sh
+++ b/V9/odoo_install.sh
@@ -150,50 +150,50 @@ DESC=$OE_CONFIG
 USER=$OE_USER
 
 # Specify an alternate config file (Default: /etc/openerp-server.conf).
-CONFIGFILE="/etc/$OE_CONFIG.conf"
+CONFIGFILE="/etc/${OE_CONFIG}.conf"
 
 # pidfile
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/var/run/\${NAME}.pid
 
 # Additional options that are passed to the Daemon.
-DAEMON_OPTS="-c $CONFIGFILE"
-[ -x $DAEMON ] || exit 0
-[ -f $CONFIGFILE ] || exit 0
+DAEMON_OPTS="-c \$CONFIGFILE"
+[ -x \$DAEMON ] || exit 0
+[ -f \$CONFIGFILE ] || exit 0
 checkpid() {
-[ -f $PIDFILE ] || return 1
-pid=`cat $PIDFILE`
-[ -d /proc/$pid ] && return 0
+[ -f \$PIDFILE ] || return 1
+pid=`cat \$PIDFILE`
+[ -d /proc/\$pid ] && return 0
 return 1
 }
 
-case "${1}" in
+case "\${1}" in
 start)
-echo -n "Starting ${DESC}: "
-start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
---chuid ${USER} --background --make-pidfile \
---exec ${DAEMON} -- ${DAEMON_OPTS}
-echo "${NAME}."
+echo -n "Starting \${DESC}: "
+start-stop-daemon --start --quiet --pidfile \${PIDFILE} \
+--chuid \${USER} --background --make-pidfile \
+--exec \${DAEMON} -- \${DAEMON_OPTS}
+echo "\${NAME}."
 ;;
 stop)
-echo -n "Stopping ${DESC}: "
-start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \
+echo -n "Stopping \${DESC}: "
+start-stop-daemon --stop --quiet --pidfile \${PIDFILE} \
 --oknodo
-echo "${NAME}."
+echo "\${NAME}."
 ;;
 
 restart|force-reload)
-echo -n "Restarting ${DESC}: "
-start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \
+echo -n "Restarting \${DESC}: "
+start-stop-daemon --stop --quiet --pidfile \${PIDFILE} \
 --oknodo
 sleep 1
-start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
---chuid ${USER} --background --make-pidfile \
---exec ${DAEMON} -- ${DAEMON_OPTS}
-echo "${NAME}."
+start-stop-daemon --start --quiet --pidfile \${PIDFILE} \
+--chuid \${USER} --background --make-pidfile \
+--exec \${DAEMON} -- \${DAEMON_OPTS}
+echo "\${NAME}."
 ;;
 *)
-N=/etc/init.d/${NAME}
-echo "Usage: ${NAME} {start|stop|restart|force-reload}" >&2
+N=/etc/init.d/\${NAME}
+echo "Usage: \${NAME} {start|stop|restart|force-reload}" >&2
 exit 1
 ;;
 

From 9b83dfc9a9071b21d4393702de2996feef547c8d Mon Sep 17 00:00:00 2001
From: Temur Vibliani <tvibliani@delta-comm.ge>
Date: Mon, 21 Sep 2015 19:02:01 +0400
Subject: [PATCH 4/9] changed some brackets

---
 V9/odoo_install.sh | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/V9/odoo_install.sh b/V9/odoo_install.sh
index c0e1e8b..ba0660b 100644
--- a/V9/odoo_install.sh
+++ b/V9/odoo_install.sh
@@ -20,7 +20,7 @@
 #odoo
 OE_USER="odoo"
 OE_HOME="/$OE_USER"
-OE_HOME_EXT="/$OE_USER/$OE_USER-server"
+OE_HOME_EXT="/$OE_USER/${OE_USER}-server"
 #The default port where this Odoo instance will run under (provided you use the command -c in the terminal)
 #Set to true if you want to install it, false if you don't need it or have it already installed.
 INSTALL_WKHTMLTOPDF="True"
@@ -34,7 +34,7 @@ OE_VERSION="9.0"
 
 #set the superadmin password
 OE_SUPERADMIN="admin"
-OE_CONFIG="$OE_USER-server"
+OE_CONFIG="${OE_USER}-server"
 
 #--------------------------------------------------
 # Update Server
@@ -108,19 +108,19 @@ echo -e "\n---- Setting permissions on home folder ----"
 sudo chown -R $OE_USER:$OE_USER $OE_HOME/*
 
 echo -e "* Create server config file"
-sudo cp $OE_HOME_EXT/debian/openerp-server.conf /etc/$OE_CONFIG.conf
-sudo chown $OE_USER:$OE_USER /etc/$OE_CONFIG.conf
-sudo chmod 640 /etc/$OE_CONFIG.conf
+sudo cp $OE_HOME_EXT/debian/openerp-server.conf /etc/${OE_CONFIG}.conf
+sudo chown $OE_USER:$OE_USER /etc/${OE_CONFIG}.conf
+sudo chmod 640 /etc/${OE_CONFIG}.conf
 
 echo -e "* Change server config file"
-sudo sed -i s/"db_user = .*"/"db_user = $OE_USER"/g /etc/$OE_CONFIG.conf
-sudo sed -i s/"; admin_passwd.*"/"admin_passwd = $OE_SUPERADMIN"/g /etc/$OE_CONFIG.conf
-sudo su root -c "echo 'logfile = /var/log/$OE_USER/$OE_CONFIG$1.log' >> /etc/$OE_CONFIG.conf"
-sudo su root -c "echo 'addons_path=$OE_HOME_EXT/addons,$OE_HOME/custom/addons' >> /etc/$OE_CONFIG.conf"
+sudo sed -i s/"db_user = .*"/"db_user = $OE_USER"/g /etc/${OE_CONFIG}.conf
+sudo sed -i s/"; admin_passwd.*"/"admin_passwd = $OE_SUPERADMIN"/g /etc/${OE_CONFIG}.conf
+sudo su root -c "echo 'logfile = /var/log/$OE_USER/$OE_CONFIG$1.log' >> /etc/${OE_CONFIG}.conf"
+sudo su root -c "echo 'addons_path=$OE_HOME_EXT/addons,$OE_HOME/custom/addons' >> /etc/${OE_CONFIG}.conf"
 
 echo -e "* Create startup file"
 sudo su root -c "echo '#!/bin/sh' >> $OE_HOME_EXT/start.sh"
-sudo su root -c "echo 'sudo -u $OE_USER $OE_HOME_EXT/openerp-server --config=/etc/$OE_CONFIG.conf' >> $OE_HOME_EXT/start.sh"
+sudo su root -c "echo 'sudo -u $OE_USER $OE_HOME_EXT/openerp-server --config=/etc/${OE_CONFIG}.conf' >> $OE_HOME_EXT/start.sh"
 sudo chmod 755 $OE_HOME_EXT/start.sh
 
 #--------------------------------------------------
@@ -169,31 +169,31 @@ return 1
 case "\${1}" in
 start)
 echo -n "Starting \${DESC}: "
-start-stop-daemon --start --quiet --pidfile \${PIDFILE} \
---chuid \${USER} --background --make-pidfile \
---exec \${DAEMON} -- \${DAEMON_OPTS}
+start-stop-daemon --start --quiet --pidfile \$PIDFILE \
+--chuid \$USER --background --make-pidfile \
+--exec \$DAEMON -- \$DAEMON_OPTS
 echo "\${NAME}."
 ;;
 stop)
 echo -n "Stopping \${DESC}: "
-start-stop-daemon --stop --quiet --pidfile \${PIDFILE} \
+start-stop-daemon --stop --quiet --pidfile \$PIDFILE \
 --oknodo
 echo "\${NAME}."
 ;;
 
 restart|force-reload)
 echo -n "Restarting \${DESC}: "
-start-stop-daemon --stop --quiet --pidfile \${PIDFILE} \
+start-stop-daemon --stop --quiet --pidfile \$PIDFILE \
 --oknodo
 sleep 1
-start-stop-daemon --start --quiet --pidfile \${PIDFILE} \
---chuid \${USER} --background --make-pidfile \
---exec \${DAEMON} -- \${DAEMON_OPTS}
+start-stop-daemon --start --quiet --pidfile \$PIDFILE \
+--chuid \$USER --background --make-pidfile \
+--exec \$DAEMON -- \$DAEMON_OPTS
 echo "\${NAME}."
 ;;
 *)
-N=/etc/init.d/\${NAME}
-echo "Usage: \${NAME} {start|stop|restart|force-reload}" >&2
+N=/etc/init.d/\$NAME
+echo "Usage: \$NAME {start|stop|restart|force-reload}" >&2
 exit 1
 ;;
 
@@ -207,7 +207,7 @@ sudo chmod 755 /etc/init.d/$OE_CONFIG
 sudo chown root: /etc/init.d/$OE_CONFIG
 
 echo -e "* Change default xmlrpc port"
-sudo su root -c "echo 'xmlrpc_port = $OE_PORT' >> /etc/$OE_CONFIG.conf"
+sudo su root -c "echo 'xmlrpc_port = $OE_PORT' >> /etc/${OE_CONFIG}.conf"
 
 echo -e "* Start ODOO on Startup"
 sudo update-rc.d $OE_CONFIG defaults

From 94ff9ff04cd4a4dd682633bf224d67f5178dceb0 Mon Sep 17 00:00:00 2001
From: Temur Vibliani <tvibliani@delta-comm.ge>
Date: Tue, 22 Sep 2015 15:24:19 +0400
Subject: [PATCH 5/9] [IMP] Added missed -y option to 'apt-get install'

 - In order to automate installation, added -y option to "apt-get
   install" command, as without -y the command enters interactive
   mode with a question below:
     "Do you want to continue? [Y/n]"
---
 V9/odoo_install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/V9/odoo_install.sh b/V9/odoo_install.sh
index ba0660b..867e5a8 100644
--- a/V9/odoo_install.sh
+++ b/V9/odoo_install.sh
@@ -68,9 +68,9 @@ echo -e "\n---- Install python libraries ----"
 sudo pip install gdata
 
 echo -e "\n--- Install other required packages"
-sudo apt-get install node-clean-css
-sudo apt-get install node-less
-sudo apt-get install python-gevent
+sudo apt-get install node-clean-css -y
+sudo apt-get install node-less -y
+sudo apt-get install python-gevent -y
 
 #--------------------------------------------------
 # Install Wkhtmltopdf if needed

From 0e1cc7b9b3e318c84d1c656ffbf299d50cd57dc6 Mon Sep 17 00:00:00 2001
From: Temur Vibliani <tvibliani@delta-comm.ge>
Date: Tue, 22 Sep 2015 16:46:39 +0400
Subject: [PATCH 6/9] [FIX] Escape inner cat command of init script

---
 V9/odoo_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/V9/odoo_install.sh b/V9/odoo_install.sh
index 867e5a8..ce83190 100644
--- a/V9/odoo_install.sh
+++ b/V9/odoo_install.sh
@@ -161,7 +161,7 @@ DAEMON_OPTS="-c \$CONFIGFILE"
 [ -f \$CONFIGFILE ] || exit 0
 checkpid() {
 [ -f \$PIDFILE ] || return 1
-pid=`cat \$PIDFILE`
+pid=\`cat \$PIDFILE\`
 [ -d /proc/\$pid ] && return 0
 return 1
 }

From d2225160f35bb092527f7d7067fc6bac7614a5b2 Mon Sep 17 00:00:00 2001
From: Temur Vibliani <tvibliani@delta-comm.ge>
Date: Tue, 22 Sep 2015 18:37:00 +0400
Subject: [PATCH 7/9] Add gdebi-core package to install tools

 - Added gdebi-core package to install tools list in order
   to have available the 'gdebi' command.
---
 V9/odoo_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/V9/odoo_install.sh b/V9/odoo_install.sh
index ce83190..684a182 100644
--- a/V9/odoo_install.sh
+++ b/V9/odoo_install.sh
@@ -59,7 +59,7 @@ sudo su - postgres -c "createuser -s $OE_USER" 2> /dev/null || true
 # Install Dependencies
 #--------------------------------------------------
 echo -e "\n---- Install tool packages ----"
-sudo apt-get install wget subversion git bzr bzrtools python-pip -y
+sudo apt-get install wget subversion git bzr bzrtools python-pip gdebi-core -y
 	
 echo -e "\n---- Install python packages ----"
 sudo apt-get install python-dateutil python-feedparser python-ldap python-libxslt1 python-lxml python-mako python-openid python-psycopg2 python-pybabel python-pychart python-pydot python-pyparsing python-reportlab python-simplejson python-tz python-vatnumber python-vobject python-webdav python-werkzeug python-xlwt python-yaml python-zsi python-docutils python-psutil python-mock python-unittest2 python-jinja2 python-pypdf python-decorator python-requests python-passlib python-pil -y

From 3d76467a64803c9ecaf5294ee3949db9249f2a8e Mon Sep 17 00:00:00 2001
From: Temur Vibliani <tvibliani@delta-comm.ge>
Date: Tue, 22 Sep 2015 20:21:13 +0400
Subject: [PATCH 8/9] [IMP] select wkhtml2pdf between x64 & x32 versions

 - Automatically choose between wkhtml2pdf x64 and x32 versions,
   according of host architecture.
 - Replaced "dpkg -i" with "gdebi --n", in order to have installed
   all wkhtml2pdf dependencies automatically, if any of them is missing
   from the system.
 - Make shortcuts in /usr/bin directory, instead of copying actual binary
   files that are part of installed wkthml2pdf package.
 - Added .gitignore in order to prevent garbage file upload to the
   repository.
---
 .gitignore         |  4 ++++
 V9/odoo_install.sh | 24 +++++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f56ec4b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*~
+*.swp
+*.tmp
+*.bak
diff --git a/V9/odoo_install.sh b/V9/odoo_install.sh
index 684a182..2de10ad 100644
--- a/V9/odoo_install.sh
+++ b/V9/odoo_install.sh
@@ -24,6 +24,14 @@ OE_HOME_EXT="/$OE_USER/${OE_USER}-server"
 #The default port where this Odoo instance will run under (provided you use the command -c in the terminal)
 #Set to true if you want to install it, false if you don't need it or have it already installed.
 INSTALL_WKHTMLTOPDF="True"
+##
+###  WKHTMLTOPDF download links
+## === Ubuntu Trusty x64 & x32 === (for other distributions please replace these two links,
+## in order to have correct version of wkhtmltox installed, for a danger note refer to 
+## https://www.odoo.com/documentation/8.0/setup/install.html#deb ):
+WKHTMLTOX_X64=http://download.gna.org/wkhtmltopdf/0.12/0.12.1/wkhtmltox-0.12.1_linux-trusty-amd64.deb
+WKHTMLTOX_X32=http://download.gna.org/wkhtmltopdf/0.12/0.12.1/wkhtmltox-0.12.1_linux-trusty-i386.deb
+
 
 #Set the default Odoo port (you still have to use -c /etc/odoo-server.conf for example to use this.)
 OE_PORT="8069"
@@ -76,11 +84,17 @@ sudo apt-get install python-gevent -y
 # Install Wkhtmltopdf if needed
 #--------------------------------------------------
 if [ $INSTALL_WKHTMLTOPDF = "True" ]; then
-echo -e "\n---- Install wkhtml and place on correct place for ODOO 8 ----"
-sudo wget http://download.gna.org/wkhtmltopdf/0.12/0.12.1/wkhtmltox-0.12.1_linux-trusty-amd64.deb
-sudo dpkg -i wkhtmltox-0.12.1_linux-trusty-amd64.deb
-sudo cp /usr/local/bin/wkhtmltopdf /usr/bin
-sudo cp /usr/local/bin/wkhtmltoimage /usr/bin
+  echo -e "\n---- Install wkhtml and place shortcuts on correct place for ODOO 9 ----"
+  #pick up correct one from x64 & x32 versions:
+  if ((1<<32));then
+      _url=$WKHTMLTOX_X64
+  else
+      _url=$WKHTMLTOX_X32
+  fi
+  sudo wget $_url
+  sudo gdebi --n `basename $_url`
+  sudo ln -s /usr/local/bin/wkhtmltopdf /usr/bin
+  sudo ln -s /usr/local/bin/wkhtmltoimage /usr/bin
 else
   echo "Wkhtmltopdf isn't installed due to the choice of the user!"
 fi

From 4279e265702903258bc51c3c3cbc0933b9f2632b Mon Sep 17 00:00:00 2001
From: Temur Vibliani <tvibliani@delta-comm.ge>
Date: Wed, 23 Sep 2015 18:01:07 +0400
Subject: [PATCH 9/9] [FIX] replaced integer overflow test with getconf

 - Integer overflow test does not worked properly and is not reliable
   indicator of host architecture, it replaced with "getconf LONG_BIT"
   that was tested and worked properly on Ubuntu 14.04.
   now wkhtml2pdf downloads are correctly adapted to x64 and x32 hosts.
---
 V9/odoo_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/V9/odoo_install.sh b/V9/odoo_install.sh
index 2de10ad..a525f8f 100644
--- a/V9/odoo_install.sh
+++ b/V9/odoo_install.sh
@@ -86,7 +86,7 @@ sudo apt-get install python-gevent -y
 if [ $INSTALL_WKHTMLTOPDF = "True" ]; then
   echo -e "\n---- Install wkhtml and place shortcuts on correct place for ODOO 9 ----"
   #pick up correct one from x64 & x32 versions:
-  if ((1<<32));then
+  if [ "`getconf LONG_BIT`" == "64" ];then
       _url=$WKHTMLTOX_X64
   else
       _url=$WKHTMLTOX_X32