From b047220417e9cd13aae587ef1a9425cdb72fd74f Mon Sep 17 00:00:00 2001
From: "Kay Marquardt (Gnadelwartz)" <kay@rrr.de>
Date: Sat, 20 May 2017 10:26:43 +0200
Subject: [PATCH] check for additional standard modules eg majordomo

---
 update-from-repo.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/update-from-repo.sh b/update-from-repo.sh
index 60befb286..69b0f2ebc 100755
--- a/update-from-repo.sh
+++ b/update-from-repo.sh
@@ -119,7 +119,7 @@ if [[ $EUID -eq 0 ]]; then
 
         ####################
         # start processing pulled source
-	version="`head -c -1 ${TEMP}/version`.`cd ${TEMP}; git log -1 --format=%cd --date=format:'%m%d.%H%M'`"
+	version="`head -c -1 ${TEMP}/version`.`cd ${TEMP}; git log -1 --format=%cd --date=format:'%m%d.%H%M'`" 
         if [[ "${LANG}" != "YES" ]]; then
           ###############
           # FULL update
@@ -128,6 +128,16 @@ if [[ $EUID -eq 0 ]]; then
           mkdir ${TEMP}/tarballs
           ( cd ${TEMP}; perl makedist.pl ${version} ) 2>/dev/null
 
+          # check for additional standard modules
+          # fixed list better than guessing?
+          for module in `ls */module.info`
+          do 
+            if [[ -f ${TEMP}/${module} && ! -f  "${TEMP}/tarballs/${PROD}-${version}/$module" ]]; then
+              module=`dirname $module`
+              echo "Adding module $module" && cp -r -L ${TEMP}/$module ${TEMP}/tarballs/${PROD}-${version}/
+            fi
+          done
+
           #prepeare unattended upgrade
           config_dir=/etc/${PROD}
           atboot="NO"
@@ -144,7 +154,7 @@ if [[ $EUID -eq 0 ]]; then
           echo -e "${GREEN}start updating LANG files for${NC} ${RPOD} ... ${LGREY}.=dir s=symlink S=dir symlink${NC}"
 
           # list all lang singe-files, lang dirs and linked modules here
-          for FILE in `ls -d lang */lang ulang */ulang */config.info.* */module.info filemin 2>/dev/null`
+          for FILE in `ls -d */lang */ulang */config.info.* */module.info filemin 2>/dev/null`
           do
             MODUL=`dirname $FILE`; SKIP=`echo $MODUL | sed "s/$IGNORE/SKIP/"`
             if [ "$SKIP" == "SKIP" ]; then