Merge branch 'dev/master'

wslutilities · Nov 17, 2024 · fa8b37c · fa8b37c
2 parents 59249c1 + 3dabbee
commit fa8b37c
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 35 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -8,7 +8,7 @@ jobs:
     name: Documentation Deployment
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: deploy manpages to website
         env:
           GH_TOKEN: ${{ secrets.GITLAB_DEPLOY_KEY }}

diff --git a/.github/workflows/manpage.yml b/.github/workflows/manpage.yml
@@ -8,7 +8,7 @@ jobs:
     name: Manpage Generate and Deployment
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Pre-requisites
         run: |
           sudo apt-get update -qq

diff --git a/.github/workflows/pkgbuild.yml b/.github/workflows/pkgbuild.yml
@@ -10,7 +10,7 @@ jobs:
     name: Debian
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Pre-requisites
         run: |
           sudo apt-get update -qq
@@ -23,15 +23,15 @@ jobs:
           cd ../
           mkdir -p ./pkgs
           mv ../wsl*.* ./pkgs
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         with:
           name: DebianDEBs
           path: pkgs
   pgwbuild:
     name: Pengwin
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Pre-requisites
         run: |
           sudo apt-get update -qq
@@ -44,7 +44,7 @@ jobs:
           cd ../
           mkdir -p ./pkgs
           mv ../wsl*.* ./pkgs
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         with:
           name: PengwinDEBs
           path: pkgs
@@ -55,9 +55,10 @@ jobs:
     container: cimg/ruby:2.7
     steps:
       - name: Retrive package for deployment
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: PengwinDEBs
+          path: PengwinDEBs
       - run: gem install package_cloud
       - name: deploy to the dev
         env:
@@ -67,7 +68,7 @@ jobs:
     name: RPM - OpenSUSE Build Service
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Pre-requisites
         run: |
           sudo apt-get update -qq
@@ -88,7 +89,7 @@ jobs:
           mkdir obs_res
           cp ../wslu-*.tar.gz obs_res
           cp ../wslu-canary.spec obs_res
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         with:
           name: OBS_RES
           path: obs_res
@@ -98,9 +99,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
         - name: Retrive package for deployment
-          uses: actions/download-artifact@v1
+          uses: actions/download-artifact@v4
           with:
             name: OBS_RES
+            path: OBS_RES
         - name: Install Pre-requisites
           run: |
             sudo apt-get update -qq
@@ -122,7 +124,7 @@ jobs:
     name: RPM - Cool Other Package Repo
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Pre-requisites
         run: |
           sudo apt-get update -qq
@@ -144,7 +146,7 @@ jobs:
           cp SRPMS/* compiled_rpms
           cp RPMS/noarch/* compiled_rpms
         #uses: robertdebock/[email protected]
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         with:
           name: COPRRPMs
           path: compiled_rpms
@@ -155,9 +157,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
         - name: Retrive package for deployment
-          uses: actions/download-artifact@v1
+          uses: actions/download-artifact@v4
           with:
             name: COPRRPMs
+            path: COPRRPMs
         - name: Install API token for copr-cli
           env:
             API_TOKEN_CONTENT: ${{ secrets.COPR_API_TOKEN }}

diff --git a/.github/workflows/pkgdeploy.yaml b/.github/workflows/pkgdeploy.yaml
@@ -21,7 +21,7 @@ jobs:
           git clone https://github.com/wslutilities/wslu-debian builder
           cd ./builder
           bash ./build.sh latest debian buster
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         with:
           name: DebianDEBs
           path: builder/pkgs
@@ -39,7 +39,7 @@ jobs:
           git clone https://github.com/wslutilities/wslu-debian builder
           cd ./builder
           bash ./build.sh latest pengwin
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         with:
           name: PengwinDEBs
           path: builder/pkgs
@@ -50,9 +50,10 @@ jobs:
     container: cimg/ruby:2.7
     steps:
       - name: Retrive package for deployment
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: PengwinDEBs
+          path: PengwinDEBs
       - run: gem install package_cloud
       - name: deploy to bullseye repo
         env:
@@ -67,7 +68,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs: tests
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Pre-requisites
         run: |
           sudo apt-get update -qq
@@ -88,7 +89,7 @@ jobs:
           mkdir obs_res
           cp ../wslu-*.tar.gz obs_res
           cp ../wslu.spec obs_res
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         with:
           name: OBS_RES
           path: obs_res
@@ -98,9 +99,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
         - name: Retrive package for deployment
-          uses: actions/download-artifact@v1
+          uses: actions/download-artifact@v4
           with:
             name: OBS_RES
+            path: OBS_RES
         - name: Install Pre-requisites
           run: |
             sudo apt-get update -qq
@@ -123,7 +125,7 @@ jobs:
     needs: tests
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Pre-requisites
         run: |
           sudo apt-get update -qq
@@ -144,7 +146,7 @@ jobs:
           mkdir compiled_rpms
           cp SRPMS/* compiled_rpms
           cp RPMS/noarch/* compiled_rpms
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         with:
           name: COPRRPMs
           path: compiled_rpms
@@ -155,9 +157,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
         - name: Retrive package for deployment
-          uses: actions/download-artifact@v1
+          uses: actions/download-artifact@v4
           with:
             name: COPRRPMs
+            path: COPRRPMs
         - name: Install API token for copr-cli
           env:
             API_TOKEN_CONTENT: ${{ secrets.COPR_API_TOKEN }}

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -9,7 +9,7 @@ jobs:
     name: ShellCheck Tests
     runs-on: ubuntu-20.04
     steps: 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Pre-requisites
         run: |
           sudo apt-get update -qq
@@ -26,7 +26,7 @@ jobs:
         run: |
           git config --global core.autocrlf false
           git config --global core.eol lf
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: Vampire/[email protected]
         with:
           distribution: Debian

diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,4 @@ compiled_rpms
 pkgs
 
 # system files
-**/*/.DS_Store
-
-# Synk Scanning Cache
-.dccache
+**/*/.DS_Store
diff --git a/Makefile b/Makefile
@@ -33,13 +33,16 @@ install: doc_install res_install conf_install
 
 uninstall: 
 	for f in $(INSTEDEXES); do \
-		rm -f $$f; \
+		if [ `basename $$f` != "wslpath" ] && [ `basename $$f` != "wslinfo" ]; then \
+			rm -f $$f; \
+		fi; \
 	done
 	for f in $(INSTEDMANOS); do \
 		rm -f $$f; \
 	done
 	rm -rf $(DESTDIR)$(PREFIX)/share/man/man7/wslu.7.gz
 	rm -rf $(DESTDIR)$(PREFIX)/share/wslu
+	rm -f $(DESTDIR)$(PREFIX)/share/applications/wslview.desktop
 
 doc:
 	[ -d $(OUTMANPATH) ] || mkdir $(OUTMANPATH)
@@ -59,7 +62,7 @@ res_install:
 	install -Dm 644 src/etc/*.ps1 -t $(DESTDIR)$(PREFIX)/share/wslu
 	install -Dm 644 src/etc/*.ico -t $(DESTDIR)$(PREFIX)/share/wslu
 	install -Dm 755 src/etc/*.sh -t $(DESTDIR)$(PREFIX)/share/wslu
-	install -Dm 644 src/etc/*.desktop $(DESTDIR)$(PREFIX)/share/wslu
+	install -Dm 644 src/etc/wslview.desktop -t $(DESTDIR)$(PREFIX)/share/applications
 	install -Dm 644 src/etc/conf $(DESTDIR)$(PREFIX)/share/wslu
 
 conf_install:

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.1.3-1
+4.1.4-1
diff --git a/src/wslu-header b/src/wslu-header
@@ -78,10 +78,14 @@ if __wsl_conf_read interop enabled | grep false >/dev/null; then
 	2. under [interop] section, set enabled to true;
 	3. restart your distribution."
 	exit 1
-elif grep ^disabled /proc/sys/fs/binfmt_misc/WSLInterop >/dev/null; then
-	 echo -e "WSL Interopability is temporarily disabled and WSL Utilities won't work. Please enable it by:
-	# echo 1 > /proc/sys/fs/binfmt_misc/WSLInterop"
-	exit 1
+elif [ -f /proc/sys/fs/binfmt_misc/WSLInterop ] && grep -q '^disabled' /proc/sys/fs/binfmt_misc/WSLInterop; then
+    echo "WSL Interopability is temporarily disabled and WSL Utilities won't work. Please enable it by:
+    # echo 1 > /proc/sys/fs/binfmt_misc/WSLInterop"
+    exit 1
+elif [ -f /proc/sys/fs/binfmt_misc/WSLInterop-late ] && grep -q '^disabled' /proc/sys/fs/binfmt_misc/WSLInterop-late; then
+    echo "WSL Interopability is temporarily disabled and WSL Utilities won't work. Please enable it by:
+    # echo 1 > /proc/sys/fs/binfmt_misc/WSLInterop-late"
+    exit 1
 fi
 
 # when --verbose, verbose; when --debug, debug.