From 35354205d674face1d93b91752cb9a17076d03f5 Mon Sep 17 00:00:00 2001 From: Ludovic <54670129+lbr38@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:06:45 +0100 Subject: [PATCH] patch --- .github/workflows/release.yml | 8 ++++---- linupdate | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b0022c9..387f514 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,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/ @@ -35,7 +35,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 @@ -91,7 +91,7 @@ jobs: mkdir -p $HOME/rpmbuild/SPECS mkdir -p /etc/linupdate/modules mkdir -p /opt/linupdate - mkdir -p /opt/linupdate/.src/ + mkdir -p /opt/linupdate/src/ mkdir -p /opt/linupdate/mods-available/ mkdir -p /opt/linupdate/mods-enabled/ mkdir -p /opt/linupdate/agents-available/ @@ -101,7 +101,7 @@ jobs: - name: Copy files to include in the build run: | - cp -r ${GITHUB_WORKSPACE}/src/* /opt/linupdate/.src/ + 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 index 5c74c0f..9434ba1 100755 --- 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 -SRC_SIR="${BASE_DIR}/.src" # Source code 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 @@ -118,7 +118,7 @@ if [ ! -d "$SRC_DIR" ];then exit 1 fi -# Sourcing all files inside .src dir +# Sourcing all files inside src dir for SRC_FILE in $(ls -A1 "$SRC_DIR");do source "$SRC_DIR/$SRC_FILE" done