From 7a6ddfc529d69b222d52e10dfdec9943106f6efe Mon Sep 17 00:00:00 2001 From: "Jinming Wu, Patrick" Date: Wed, 31 Jul 2024 22:42:40 +0800 Subject: [PATCH 01/12] chore: [GH #315 ] remove old unused configure.sh -i --- configure.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configure.sh b/configure.sh index f8b394b9..ae1b91f1 100644 --- a/configure.sh +++ b/configure.sh @@ -67,13 +67,6 @@ case $distro in esac } -function main_inst { -env_check -pkg_inst -make -sudo make DESTDIR=/usr install -} - function general_build_prep { sed -i s/VERSIONPLACEHOLDER/"$(cat ./VERSION)"/g ./src/wslu-header } @@ -117,7 +110,6 @@ for args; do --deb) deb_build_prep $2; exit;; -e|--env) env_check; exit;; -P|--pkg) pkg_inst; exit;; - -i|--install) main_inst; exit;; *) exit 1;; esac done From bc9b4fbaae464921295d19946577420cd47296ae Mon Sep 17 00:00:00 2001 From: "Jinming Wu, Patrick" Date: Wed, 31 Jul 2024 23:27:48 +0800 Subject: [PATCH 02/12] build: [GH #314 ] prevent removal of wslpath --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 23990093..81c3f35f 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,9 @@ install: doc_install res_install conf_install uninstall: for f in $(INSTEDEXES); do \ - rm -f $$f; \ + if [ `basename $$f` != "wslpath" ]; then \ + rm -f $$f; \ + fi; \ done for f in $(INSTEDMANOS); do \ rm -f $$f; \ From c3af5e18e326df9d4c41eebc1467f51bc2741383 Mon Sep 17 00:00:00 2001 From: Tim Schwenke Date: Wed, 31 Jul 2024 19:28:27 +0200 Subject: [PATCH 03/12] build: [GH #316 ] prevent removal of wslinfo --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 81c3f35f..f1dc82d2 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ install: doc_install res_install conf_install uninstall: for f in $(INSTEDEXES); do \ - if [ `basename $$f` != "wslpath" ]; then \ + if [ `basename $$f` != "wslpath" ] && [ `basename $$f` != "wslinfo" ]; then \ rm -f $$f; \ fi; \ done From 372746d41487cc22cf7e37185c628a701bbbb358 Mon Sep 17 00:00:00 2001 From: Jax Young Date: Thu, 22 Aug 2024 17:04:05 +0800 Subject: [PATCH 04/12] feat: register wslview as a XDG MIME applications This change allows desktop environment to find and use wslview to open registered MIME types. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f1dc82d2..fee8a420 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,7 @@ uninstall: 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) @@ -61,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: From 8305eab38bbad45505d6a9903ce3e96ea233337c Mon Sep 17 00:00:00 2001 From: "Jinming Wu, Patrick" Date: Wed, 4 Sep 2024 10:27:07 +0800 Subject: [PATCH 05/12] ci: fix GHSA-cxww-7g56-2vh6 --- .github/workflows/pkgbuild.yml | 6 +++--- .github/workflows/pkgdeploy.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pkgbuild.yml b/.github/workflows/pkgbuild.yml index d21b80eb..80894399 100644 --- a/.github/workflows/pkgbuild.yml +++ b/.github/workflows/pkgbuild.yml @@ -55,7 +55,7 @@ jobs: container: cimg/ruby:2.7 steps: - name: Retrive package for deployment - uses: actions/download-artifact@v1 + uses: actions/download-artifact@4.1.7 with: name: PengwinDEBs - run: gem install package_cloud @@ -98,7 +98,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Retrive package for deployment - uses: actions/download-artifact@v1 + uses: actions/download-artifact@4.1.7 with: name: OBS_RES - name: Install Pre-requisites @@ -155,7 +155,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Retrive package for deployment - uses: actions/download-artifact@v1 + uses: actions/download-artifact@4.1.7 with: name: COPRRPMs - name: Install API token for copr-cli diff --git a/.github/workflows/pkgdeploy.yaml b/.github/workflows/pkgdeploy.yaml index ddc2af41..815014af 100644 --- a/.github/workflows/pkgdeploy.yaml +++ b/.github/workflows/pkgdeploy.yaml @@ -50,7 +50,7 @@ jobs: container: cimg/ruby:2.7 steps: - name: Retrive package for deployment - uses: actions/download-artifact@v1 + uses: actions/download-artifact@4.1.7 with: name: PengwinDEBs - run: gem install package_cloud @@ -98,7 +98,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Retrive package for deployment - uses: actions/download-artifact@v1 + uses: actions/download-artifact@4.1.7 with: name: OBS_RES - name: Install Pre-requisites @@ -155,7 +155,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Retrive package for deployment - uses: actions/download-artifact@v1 + uses: actions/download-artifact@4.1.7 with: name: COPRRPMs - name: Install API token for copr-cli From 2d6103bc6333294bdf860b040896d01766eb8de8 Mon Sep 17 00:00:00 2001 From: "Jinming Wu, Patrick" Date: Wed, 4 Sep 2024 10:49:02 +0800 Subject: [PATCH 06/12] ci: fix bad artifact version number --- .github/workflows/pkgbuild.yml | 6 +++--- .github/workflows/pkgdeploy.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pkgbuild.yml b/.github/workflows/pkgbuild.yml index 80894399..b0c08484 100644 --- a/.github/workflows/pkgbuild.yml +++ b/.github/workflows/pkgbuild.yml @@ -55,7 +55,7 @@ jobs: container: cimg/ruby:2.7 steps: - name: Retrive package for deployment - uses: actions/download-artifact@4.1.7 + uses: actions/download-artifact@v4 with: name: PengwinDEBs - run: gem install package_cloud @@ -98,7 +98,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Retrive package for deployment - uses: actions/download-artifact@4.1.7 + uses: actions/download-artifact@v4 with: name: OBS_RES - name: Install Pre-requisites @@ -155,7 +155,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Retrive package for deployment - uses: actions/download-artifact@4.1.7 + uses: actions/download-artifact@v4 with: name: COPRRPMs - name: Install API token for copr-cli diff --git a/.github/workflows/pkgdeploy.yaml b/.github/workflows/pkgdeploy.yaml index 815014af..b9cfd4c5 100644 --- a/.github/workflows/pkgdeploy.yaml +++ b/.github/workflows/pkgdeploy.yaml @@ -50,7 +50,7 @@ jobs: container: cimg/ruby:2.7 steps: - name: Retrive package for deployment - uses: actions/download-artifact@4.1.7 + uses: actions/download-artifact@v4 with: name: PengwinDEBs - run: gem install package_cloud @@ -98,7 +98,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Retrive package for deployment - uses: actions/download-artifact@4.1.7 + uses: actions/download-artifact@v4 with: name: OBS_RES - name: Install Pre-requisites @@ -155,7 +155,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Retrive package for deployment - uses: actions/download-artifact@4.1.7 + uses: actions/download-artifact@v4 with: name: COPRRPMs - name: Install API token for copr-cli From 4bc7586726c5cf3c926eafa3707dee749a92d071 Mon Sep 17 00:00:00 2001 From: "Jinming Wu, Patrick" Date: Wed, 4 Sep 2024 11:03:00 +0800 Subject: [PATCH 07/12] ci: upgrade actions/checkout and actions/upload-artifact to v4 --- .github/workflows/docs.yml | 2 +- .github/workflows/manpage.yml | 2 +- .github/workflows/pkgbuild.yml | 8 ++++---- .github/workflows/pkgdeploy.yaml | 4 ++-- .github/workflows/tests.yaml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 32ca833f..ab94e812 100644 --- 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 index 5d9cc011..1b244012 100644 --- 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 index b0c08484..ed41be52 100644 --- 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 @@ -31,7 +31,7 @@ jobs: 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 @@ -67,7 +67,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 @@ -122,7 +122,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 diff --git a/.github/workflows/pkgdeploy.yaml b/.github/workflows/pkgdeploy.yaml index b9cfd4c5..81a887ab 100644 --- a/.github/workflows/pkgdeploy.yaml +++ b/.github/workflows/pkgdeploy.yaml @@ -67,7 +67,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 @@ -123,7 +123,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 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 0792f9ba..aff8b7c0 100644 --- 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/setup-wsl@v1.2.0 with: distribution: Debian From 5c26eff62709c136a712f90343e9a0a2663a21e3 Mon Sep 17 00:00:00 2001 From: "Jinming Wu, Patrick" Date: Wed, 4 Sep 2024 11:11:05 +0800 Subject: [PATCH 08/12] ci: further fixes on missed actions/upload-artifact --- .github/workflows/pkgbuild.yml | 8 ++++---- .github/workflows/pkgdeploy.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pkgbuild.yml b/.github/workflows/pkgbuild.yml index ed41be52..b25c8503 100644 --- a/.github/workflows/pkgbuild.yml +++ b/.github/workflows/pkgbuild.yml @@ -23,7 +23,7 @@ jobs: cd ../ mkdir -p ./pkgs mv ../wsl*.* ./pkgs - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: DebianDEBs path: pkgs @@ -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 @@ -88,7 +88,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 @@ -144,7 +144,7 @@ jobs: cp SRPMS/* compiled_rpms cp RPMS/noarch/* compiled_rpms #uses: robertdebock/rpmbuild-action@1.1.1 - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v4 with: name: COPRRPMs path: compiled_rpms diff --git a/.github/workflows/pkgdeploy.yaml b/.github/workflows/pkgdeploy.yaml index 81a887ab..c794f721 100644 --- 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 @@ -88,7 +88,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 @@ -144,7 +144,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 From 87704cf31f0ec3c97fc1fb89265264ecca99f2b2 Mon Sep 17 00:00:00 2001 From: "Jinming Wu, Patrick" Date: Wed, 4 Sep 2024 17:14:39 +0800 Subject: [PATCH 09/12] ci: fix chnages to download-artifact@v4 --- .github/workflows/pkgbuild.yml | 3 +++ .github/workflows/pkgdeploy.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/pkgbuild.yml b/.github/workflows/pkgbuild.yml index b25c8503..d91a416f 100644 --- a/.github/workflows/pkgbuild.yml +++ b/.github/workflows/pkgbuild.yml @@ -58,6 +58,7 @@ jobs: uses: actions/download-artifact@v4 with: name: PengwinDEBs + path: PengwinDEBs - run: gem install package_cloud - name: deploy to the dev env: @@ -101,6 +102,7 @@ jobs: uses: actions/download-artifact@v4 with: name: OBS_RES + path: OBS_RES - name: Install Pre-requisites run: | sudo apt-get update -qq @@ -158,6 +160,7 @@ jobs: 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 index c794f721..ff3dbabf 100644 --- a/.github/workflows/pkgdeploy.yaml +++ b/.github/workflows/pkgdeploy.yaml @@ -53,6 +53,7 @@ jobs: uses: actions/download-artifact@v4 with: name: PengwinDEBs + path: PengwinDEBs - run: gem install package_cloud - name: deploy to bullseye repo env: @@ -101,6 +102,7 @@ jobs: uses: actions/download-artifact@v4 with: name: OBS_RES + path: OBS_RES - name: Install Pre-requisites run: | sudo apt-get update -qq @@ -158,6 +160,7 @@ jobs: 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 }} From 5f8e8da79a50a9c004bf2895fd6770d702e331d5 Mon Sep 17 00:00:00 2001 From: "Jinming Wu, Patrick" Date: Thu, 5 Sep 2024 01:18:35 +0800 Subject: [PATCH 10/12] chore: remove stuff --- .gitignore | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b3f57400..3365763a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,4 @@ compiled_rpms pkgs # system files -**/*/.DS_Store - -# Synk Scanning Cache -.dccache \ No newline at end of file +**/*/.DS_Store \ No newline at end of file From 1f01fc1d0c50598b842d4e8e7ca5f51265817708 Mon Sep 17 00:00:00 2001 From: "Jinming Wu, Patrick" Date: Mon, 28 Oct 2024 00:00:30 +0800 Subject: [PATCH 11/12] fix: [#319] check WSLInterop-late too --- src/wslu-header | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/wslu-header b/src/wslu-header index 1efa0e52..d1432431 100644 --- 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. From 3dabbee85c64b9e09d3fb266fa96676d2e76c31f Mon Sep 17 00:00:00 2001 From: "Jinming Wu, Patrick" Date: Sun, 17 Nov 2024 23:36:28 +0800 Subject: [PATCH 12/12] chore: release 4.1.4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2325db43..5e5ff801 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.3-1 +4.1.4-1