From 4fdea3e4be4e07ba6cd3c9f7e1bc141b7a63cf8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20E=2E=20G=C3=B3mez?= <jegomez@agofer.com.co>
Date: Tue, 16 Nov 2021 23:10:03 -0500
Subject: [PATCH] [FIX] Ignores empty or commented lines in
 selected_oca_modules

---
 apply_patches.sh         |  6 +++---
 install_odoo_code.sh     | 11 ++++++-----
 selected_oca_modules.txt |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apply_patches.sh b/apply_patches.sh
index 6be29b6..69c6ece 100755
--- a/apply_patches.sh
+++ b/apply_patches.sh
@@ -78,9 +78,9 @@ pt_community ()
     OPTIONS="--directory=$DEST --strip=1"
     patch $OPTIONS < patches/20210821_base-location_no-zip-from-city.patch
 
-    # DEST=$DESTDIR/community/auth_oauth_multi_token/
-    # OPTIONS="--directory=$DEST --strip=1"
-    # patch $OPTIONS < patches/20210420_auth-oauth-multi-token_error-in-login.patch
+    DEST=$DESTDIR/community/auth_oauth_multi_token/
+    OPTIONS="--directory=$DEST --strip=1"
+    patch $OPTIONS < patches/20210420_auth-oauth-multi-token_error-in-login.patch
 }
 
 pt_all ()
diff --git a/install_odoo_code.sh b/install_odoo_code.sh
index 6a477c3..10023ce 100755
--- a/install_odoo_code.sh
+++ b/install_odoo_code.sh
@@ -38,15 +38,16 @@ cp_community ()
 {
     REPO="Modules by Odoo Community Association"
     SRC=./community/oca
-    DEST=$DESTDIR/community/
+    DEST=${DESTDIR}/community/
     echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-    echo "Install $REPO into production directory structure"
+    echo "Install ${REPO} into production directory structure"
     echo "(selected modules)"
-    echo "  …from $SRC to $DEST"
+    echo "  …from ${SRC} to ${DEST}"
     echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-    while read -r i || [ -n "$i" ]
+    while read -r line
     do
-        rsync $OPTIONS "$SRC/${i%/}" $DEST
+        [[ "$line" =~ ^# || "$line" =~ ^$ ]]  && continue
+        rsync ${OPTIONS} "${SRC}/${line%/}" ${DEST}
     done < selected_oca_modules.txt
 }
 
diff --git a/selected_oca_modules.txt b/selected_oca_modules.txt
index 3720392..a1c7804 100644
--- a/selected_oca_modules.txt
+++ b/selected_oca_modules.txt
@@ -17,6 +17,7 @@ reporting-engine/report_xlsx/
 reporting-engine/report_xlsx_helper/
 server-auth/auth_oauth_multi_token/
 server-backend/base_user_role/
+server-tools/sql_request_abstract/
 server-ux/date_range/
 web/web_m2x_options/
 web/web_responsive/