diff --git a/logrotate.sh b/logrotate.sh index faffbed..2e4f5a4 100644 --- a/logrotate.sh +++ b/logrotate.sh @@ -9,7 +9,7 @@ echo -e "Install logrotate" #-------------------------------------------------- sudo apt-get install -y logrotate -cat < /etc/logrotate.d/odoo +cat << EOF | sudo tee -a /etc/logrotate.d/odoo #Path odoo logs $OE_LOG_PATH/*.log { rotate 5 diff --git a/odoo.sh b/odoo.sh index bd28720..2e62474 100644 --- a/odoo.sh +++ b/odoo.sh @@ -37,14 +37,18 @@ sudo npm install -g less less-plugin-clean-css #-------------------------------------------------- INSTALL_WKHTMLTOPDF_VERSION=`wkhtmltopdf --version` +WKHTMLTOPDF_VERSION="0.12.6-1" if [ $INSTALL_WKHTMLTOPDF = "True" ] && [ -z "$INSTALL_WKHTMLTOPDF_VERSION" ]; then echo -e "\n---- Install wkhtml and place shortcuts on correct place for ODOO $OE_VERSION ----" - OS_RELEASE=`lsb_release -sc` - if [ "`getconf LONG_BIT`" == "64" ];then - _url=https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1."$OS_RELEASE"_amd64.deb - else - _url=https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1."$OS_RELEASE"_i386.deb + OS_RELEASE=$(awk -F= '$1=="VERSION_CODENAME" { print $2 ;}' /etc/os-release) + ARCHITECTURE=$(arch) + if [ "$ARCHITECTURE" == "amd64" ];then + _url=https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/$WKHTMLTOPDF_VERSION/wkhtmltox_"$WKHTMLTOPDF_VERSION"."$OS_RELEASE"_amd64.deb + elif [ "$ARCHITECTURE" == "i386" ];then + _url=https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/$WKHTMLTOPDF_VERSION/wkhtmltox_"$WKHTMLTOPDF_VERSION"."$OS_RELEASE"_i386.deb + elif [ "$ARCHITECTURE" == "aarch64" ];then + _url=https://github.com/wkhtmltopdf/packaging/releases/download/$WKHTMLTOPDF_VERSION/wkhtmltox_"$WKHTMLTOPDF_VERSION"."$OS_RELEASE"_arm64.deb fi wget $_url sudo dpkg -i `basename $_url` @@ -74,7 +78,7 @@ if [ ! -d "$OE_INSTALL_DIR/env" ]; then fi source $OE_INSTALL_DIR/env/bin/activate -sudo apt-get install libicu-dev libpq-dev libxml2-dev libxslt1-dev libsasl2-dev libldap2-dev libssl-dev zlib1g-dev -y +sudo apt-get install libicu-dev libpq-dev libxml2-dev libxslt1-dev libsasl2-dev libldap2-dev libssl-dev zlib1g-dev libffi-dev libjpeg-dev -y pip install --upgrade pip if [[ -f $OE_REPO/requirements.txt ]]; then diff --git a/run.sh b/run.sh old mode 100644 new mode 100755 index a1870c8..1294323 --- a/run.sh +++ b/run.sh @@ -80,8 +80,7 @@ echo "Odoo Logs: $OE_LOG_PATH/odoo-server.log" echo "Odoo Master Password: $OE_SUPERADMIN" if [ $WEB_SERVER = "nginx" ]; then echo "Nginx Odoo Site: /etc/nginx/sites-available/$OE_WEBSERV_CONF" -fi -if [ $WEB_SERVER = "apache2" ]; then +elif [ $WEB_SERVER = "apache2" ]; then echo "Apache Odoo Site: /etc/apache2/sites-available/$OE_WEBSERV_CONF" fi if [ $HTTP_PROTOCOL = "https" ] || [ $INSTALL_CERTIFICATE = "True" ]; then