patch

lbr38 · Jan 2, 2024 · 2b0f027 · 2b0f027
1 parent 3682af6
commit 2b0f027
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 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/packaging/rpm/spec b/.github/workflows/packaging/rpm/spec
@@ -54,6 +54,11 @@ if [ -f "/tmp/linupdate.conf.rpmsave" ];then
     mv /tmp/linupdate.conf.rpmsave /etc/linupdate/linupdate.conf
 fi
 
+# Delete old 'functions' directory if exists
+if [ -d "$DATA_DIR/functions" ];then
+    rm -rf "$DATA_DIR/functions"
+fi
+
 # Create a symlink to main script
 ln -sf /opt/linupdate/linupdate /usr/bin/linupdate
 

diff --git 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