patch

lbr38 · Jan 2, 2024 · c767e17 · c767e17
1 parent 33f9e95
commit c767e17
Show file tree

Hide file tree

Showing 28 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml
@@ -29,7 +29,7 @@ jobs:
           mkdir -p /tmp/linupdate-build/DEBIAN
           mkdir -p /tmp/linupdate-build/etc/linupdate/modules
           mkdir -p /tmp/linupdate-build/opt/linupdate
-          mkdir -p /tmp/linupdate-build/opt/linupdate/.src/
+          mkdir -p /tmp/linupdate-build/opt/linupdate/src/
           mkdir -p /tmp/linupdate-build/opt/linupdate/mods-available/
           mkdir -p /tmp/linupdate-build/opt/linupdate/mods-enabled/
           mkdir -p /tmp/linupdate-build/opt/linupdate/agents-available/
@@ -38,7 +38,7 @@ jobs:
 
       - name: Copy files to include in the build
         run: |
-          cp -r ${GITHUB_WORKSPACE}/src/* /tmp/linupdate-build/opt/linupdate/.src/
+          cp -r ${GITHUB_WORKSPACE}/src/* /tmp/linupdate-build/opt/linupdate/src/
           cp -r ${GITHUB_WORKSPACE}/mods-available/* /tmp/linupdate-build/opt/linupdate/mods-available/
           cp -r ${GITHUB_WORKSPACE}/service/* /tmp/linupdate-build/opt/linupdate/service/
           cp ${GITHUB_WORKSPACE}/linupdate /tmp/linupdate-build/opt/linupdate/linupdate

diff --git a/.github/workflows/build-rpm.yml b/.github/workflows/build-rpm.yml
@@ -33,7 +33,7 @@ jobs:
           mkdir -p $HOME/rpmbuild/SPECS
           mkdir -p /etc/linupdate/modules
           mkdir -p /opt/linupdate
-          mkdir -p /opt/linupdate/functions/
+          mkdir -p /opt/linupdate/src/
           mkdir -p /opt/linupdate/mods-available/
           mkdir -p /opt/linupdate/mods-enabled/
           mkdir -p /opt/linupdate/agents-available/
@@ -43,7 +43,7 @@ jobs:
 
       - name: Copy files to include in the build
         run: |
-          cp -r ${GITHUB_WORKSPACE}/functions/* /opt/linupdate/functions/
+          cp -r ${GITHUB_WORKSPACE}/src/* /opt/linupdate/src/
           cp -r ${GITHUB_WORKSPACE}/mods-available/* /opt/linupdate/mods-available/
           cp -r ${GITHUB_WORKSPACE}/service/* /opt/linupdate/service/
           cp ${GITHUB_WORKSPACE}/linupdate /opt/linupdate/linupdate

diff --git a/linupdate b/linupdate
@@ -12,7 +12,7 @@ DATE_FULL=$(date +%d-%m-%Y_%Hh%M)                   # Today date in 'DD-MM-YYYY_
 TIME=$(date +%H:%M)                                 # Time in '00:00' format
 TIME_FULL=$(date +%Hh%Mm%Ss)                        # Time in '00h00m00s' format
 LINUPDATE="${BASE_DIR}/linupdate"                   # Main program
-FUNCTIONS="${BASE_DIR}/functions"                   # Functions directory
+SRC_SIR="${BASE_DIR}/.src"                          # Source code directory
 LOGS_DIR="/var/log/linupdate"                       # Logs directory
 ETC_DIR="/etc/linupdate"                            # Configuration files directory
 CONF="${ETC_DIR}/linupdate.conf"                    # Main configuration file
@@ -112,15 +112,15 @@ mkdir -p "$MODULES_ENABLED_DIR"
 mkdir -p "$AGENTS_ENABLED_DIR"
 mkdir -p "$SERVICE_DIR"
 
-# If functions dir does not exist then quit
-if [ ! -d "$FUNCTIONS" ];then
+# If source code dir does not exist then quit
+if [ ! -d "$SRC_DIR" ];then
     echo -e "[$YELLOW ERROR $RESET] Some linupdate core files are missing. You might reinstall linupdate."
     exit 1
 fi
 
-# Sourcing all files inside functions dir
-for FUNCTION_FILE in $(ls -A1 "$FUNCTIONS");do
-    source "$FUNCTIONS/$FUNCTION_FILE"
+# Sourcing all files inside .src dir
+for SRC_FILE in $(ls -A1 "$SRC_DIR");do
+    source "$SRC_DIR/$SRC_FILE"
 done
 
 # Check that system is valid before continue

diff --git a/functions/00_check-system → src/00_check-system b/functions/00_check-system → src/00_check-system
diff --git a/functions/00_exclude → src/00_exclude b/functions/00_exclude → src/00_exclude
diff --git a/functions/00_generateConf → src/00_generateConf b/functions/00_generateConf → src/00_generateConf
diff --git a/functions/00_get-conf → src/00_get-conf b/functions/00_get-conf → src/00_get-conf
diff --git a/functions/00_get-modules → src/00_get-modules b/functions/00_get-modules → src/00_get-modules
diff --git a/functions/00_help → src/00_help b/functions/00_help → src/00_help
diff --git a/functions/00_list-modules → src/00_list-modules b/functions/00_list-modules → src/00_list-modules
diff --git a/functions/00_space-left → src/00_space-left b/functions/00_space-left → src/00_space-left
diff --git a/functions/01_exec-pre-modules → src/01_exec-pre-modules b/functions/01_exec-pre-modules → src/01_exec-pre-modules
diff --git a/functions/01_load-modules → src/01_load-modules b/functions/01_load-modules → src/01_load-modules
diff --git a/functions/02_check-packages-before-update → src/02_check-packages-before-update b/functions/02_check-packages-before-update → src/02_check-packages-before-update
diff --git a/functions/03_check-yum-lock → src/03_check-yum-lock b/functions/03_check-yum-lock → src/03_check-yum-lock
diff --git a/functions/04_update → src/04_update b/functions/04_update → src/04_update
diff --git a/functions/09_exec-post-modules → src/09_exec-post-modules b/functions/09_exec-post-modules → src/09_exec-post-modules
diff --git a/functions/09_service-restart → src/09_service-restart b/functions/09_service-restart → src/09_service-restart
diff --git a/functions/10_check-reboot-needed → src/10_check-reboot-needed b/functions/10_check-reboot-needed → src/10_check-reboot-needed
diff --git a/functions/10_send-mail → src/10_send-mail b/functions/10_send-mail → src/10_send-mail
diff --git a/functions/200_apt-history-parser → src/200_apt-history-parser b/functions/200_apt-history-parser → src/200_apt-history-parser
diff --git a/functions/200_yum-history-parser → src/200_yum-history-parser b/functions/200_yum-history-parser → src/200_yum-history-parser
diff --git a/functions/96_start-agent → src/96_start-agent b/functions/96_start-agent → src/96_start-agent
diff --git a/functions/97_stop-agent → src/97_stop-agent b/functions/97_stop-agent → src/97_stop-agent
diff --git a/functions/98_restart-agent → src/98_restart-agent b/functions/98_restart-agent → src/98_restart-agent
diff --git a/functions/99_clean-exit → src/99_clean-exit b/functions/99_clean-exit → src/99_clean-exit
diff --git a/functions/99_disable-agent → src/99_disable-agent b/functions/99_disable-agent → src/99_disable-agent
diff --git a/functions/99_enable-agent → src/99_enable-agent b/functions/99_enable-agent → src/99_enable-agent