Skip to content
This repository was archived by the owner on Mar 1, 2025. It is now read-only.

Commit fa8b37c

Browse files
patrick330602patrick330602
committed
Merge branch 'dev/master'
2 parents 59249c1 + 3dabbee commit fa8b37c

File tree

9 files changed

+45
-35
lines changed

9 files changed

+45
-35
lines changed

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Documentation Deployment
99
runs-on: ubuntu-20.04
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
1212
- name: deploy manpages to website
1313
env:
1414
GH_TOKEN: ${{ secrets.GITLAB_DEPLOY_KEY }}

‎.github/workflows/manpage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Manpage Generate and Deployment
99
runs-on: ubuntu-20.04
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
1212
- name: Install Pre-requisites
1313
run: |
1414
sudo apt-get update -qq

‎.github/workflows/pkgbuild.yml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Debian
1111
runs-on: ubuntu-20.04
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
- name: Install Pre-requisites
1515
run: |
1616
sudo apt-get update -qq
@@ -23,15 +23,15 @@ jobs:
2323
cd ../
2424
mkdir -p ./pkgs
2525
mv ../wsl*.* ./pkgs
26-
- uses: actions/upload-artifact@v1
26+
- uses: actions/upload-artifact@v4
2727
with:
2828
name: DebianDEBs
2929
path: pkgs
3030
pgwbuild:
3131
name: Pengwin
3232
runs-on: ubuntu-20.04
3333
steps:
34-
- uses: actions/checkout@v2
34+
- uses: actions/checkout@v4
3535
- name: Install Pre-requisites
3636
run: |
3737
sudo apt-get update -qq
@@ -44,7 +44,7 @@ jobs:
4444
cd ../
4545
mkdir -p ./pkgs
4646
mv ../wsl*.* ./pkgs
47-
- uses: actions/upload-artifact@v1
47+
- uses: actions/upload-artifact@v4
4848
with:
4949
name: PengwinDEBs
5050
path: pkgs
@@ -55,9 +55,10 @@ jobs:
5555
container: cimg/ruby:2.7
5656
steps:
5757
- name: Retrive package for deployment
58-
uses: actions/download-artifact@v1
58+
uses: actions/download-artifact@v4
5959
with:
6060
name: PengwinDEBs
61+
path: PengwinDEBs
6162
- run: gem install package_cloud
6263
- name: deploy to the dev
6364
env:
@@ -67,7 +68,7 @@ jobs:
6768
name: RPM - OpenSUSE Build Service
6869
runs-on: ubuntu-20.04
6970
steps:
70-
- uses: actions/checkout@v2
71+
- uses: actions/checkout@v4
7172
- name: Install Pre-requisites
7273
run: |
7374
sudo apt-get update -qq
@@ -88,7 +89,7 @@ jobs:
8889
mkdir obs_res
8990
cp ../wslu-*.tar.gz obs_res
9091
cp ../wslu-canary.spec obs_res
91-
- uses: actions/upload-artifact@v1
92+
- uses: actions/upload-artifact@v4
9293
with:
9394
name: OBS_RES
9495
path: obs_res
@@ -98,9 +99,10 @@ jobs:
9899
runs-on: ubuntu-latest
99100
steps:
100101
- name: Retrive package for deployment
101-
uses: actions/download-artifact@v1
102+
uses: actions/download-artifact@v4
102103
with:
103104
name: OBS_RES
105+
path: OBS_RES
104106
- name: Install Pre-requisites
105107
run: |
106108
sudo apt-get update -qq
@@ -122,7 +124,7 @@ jobs:
122124
name: RPM - Cool Other Package Repo
123125
runs-on: ubuntu-20.04
124126
steps:
125-
- uses: actions/checkout@v2
127+
- uses: actions/checkout@v4
126128
- name: Install Pre-requisites
127129
run: |
128130
sudo apt-get update -qq
@@ -144,7 +146,7 @@ jobs:
144146
cp SRPMS/* compiled_rpms
145147
cp RPMS/noarch/* compiled_rpms
146148
#uses: robertdebock/[email protected]
147-
- uses: actions/upload-artifact@v1
149+
- uses: actions/upload-artifact@v4
148150
with:
149151
name: COPRRPMs
150152
path: compiled_rpms
@@ -155,9 +157,10 @@ jobs:
155157
runs-on: ubuntu-latest
156158
steps:
157159
- name: Retrive package for deployment
158-
uses: actions/download-artifact@v1
160+
uses: actions/download-artifact@v4
159161
with:
160162
name: COPRRPMs
163+
path: COPRRPMs
161164
- name: Install API token for copr-cli
162165
env:
163166
API_TOKEN_CONTENT: ${{ secrets.COPR_API_TOKEN }}

‎.github/workflows/pkgdeploy.yaml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
git clone https://github.com/wslutilities/wslu-debian builder
2222
cd ./builder
2323
bash ./build.sh latest debian buster
24-
- uses: actions/upload-artifact@v1
24+
- uses: actions/upload-artifact@v4
2525
with:
2626
name: DebianDEBs
2727
path: builder/pkgs
@@ -39,7 +39,7 @@ jobs:
3939
git clone https://github.com/wslutilities/wslu-debian builder
4040
cd ./builder
4141
bash ./build.sh latest pengwin
42-
- uses: actions/upload-artifact@v1
42+
- uses: actions/upload-artifact@v4
4343
with:
4444
name: PengwinDEBs
4545
path: builder/pkgs
@@ -50,9 +50,10 @@ jobs:
5050
container: cimg/ruby:2.7
5151
steps:
5252
- name: Retrive package for deployment
53-
uses: actions/download-artifact@v1
53+
uses: actions/download-artifact@v4
5454
with:
5555
name: PengwinDEBs
56+
path: PengwinDEBs
5657
- run: gem install package_cloud
5758
- name: deploy to bullseye repo
5859
env:
@@ -67,7 +68,7 @@ jobs:
6768
runs-on: ubuntu-20.04
6869
needs: tests
6970
steps:
70-
- uses: actions/checkout@v2
71+
- uses: actions/checkout@v4
7172
- name: Install Pre-requisites
7273
run: |
7374
sudo apt-get update -qq
@@ -88,7 +89,7 @@ jobs:
8889
mkdir obs_res
8990
cp ../wslu-*.tar.gz obs_res
9091
cp ../wslu.spec obs_res
91-
- uses: actions/upload-artifact@v1
92+
- uses: actions/upload-artifact@v4
9293
with:
9394
name: OBS_RES
9495
path: obs_res
@@ -98,9 +99,10 @@ jobs:
9899
runs-on: ubuntu-latest
99100
steps:
100101
- name: Retrive package for deployment
101-
uses: actions/download-artifact@v1
102+
uses: actions/download-artifact@v4
102103
with:
103104
name: OBS_RES
105+
path: OBS_RES
104106
- name: Install Pre-requisites
105107
run: |
106108
sudo apt-get update -qq
@@ -123,7 +125,7 @@ jobs:
123125
needs: tests
124126
runs-on: ubuntu-20.04
125127
steps:
126-
- uses: actions/checkout@v2
128+
- uses: actions/checkout@v4
127129
- name: Install Pre-requisites
128130
run: |
129131
sudo apt-get update -qq
@@ -144,7 +146,7 @@ jobs:
144146
mkdir compiled_rpms
145147
cp SRPMS/* compiled_rpms
146148
cp RPMS/noarch/* compiled_rpms
147-
- uses: actions/upload-artifact@v1
149+
- uses: actions/upload-artifact@v4
148150
with:
149151
name: COPRRPMs
150152
path: compiled_rpms
@@ -155,9 +157,10 @@ jobs:
155157
runs-on: ubuntu-latest
156158
steps:
157159
- name: Retrive package for deployment
158-
uses: actions/download-artifact@v1
160+
uses: actions/download-artifact@v4
159161
with:
160162
name: COPRRPMs
163+
path: COPRRPMs
161164
- name: Install API token for copr-cli
162165
env:
163166
API_TOKEN_CONTENT: ${{ secrets.COPR_API_TOKEN }}

‎.github/workflows/tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: ShellCheck Tests
1010
runs-on: ubuntu-20.04
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313
- name: Install Pre-requisites
1414
run: |
1515
sudo apt-get update -qq
@@ -26,7 +26,7 @@ jobs:
2626
run: |
2727
git config --global core.autocrlf false
2828
git config --global core.eol lf
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v4
3030
- uses: Vampire/[email protected]
3131
with:
3232
distribution: Debian

‎.gitignore‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,4 @@ compiled_rpms
1414
pkgs
1515

1616
# system files
17-
**/*/.DS_Store
18-
19-
# Synk Scanning Cache
20-
.dccache
17+
**/*/.DS_Store

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,16 @@ install: doc_install res_install conf_install
3333

3434
uninstall:
3535
for f in $(INSTEDEXES); do \
36-
rm -f $$f; \
36+
if [ `basename $$f` != "wslpath" ] && [ `basename $$f` != "wslinfo" ]; then \
37+
rm -f $$f; \
38+
fi; \
3739
done
3840
for f in $(INSTEDMANOS); do \
3941
rm -f $$f; \
4042
done
4143
rm -rf $(DESTDIR)$(PREFIX)/share/man/man7/wslu.7.gz
4244
rm -rf $(DESTDIR)$(PREFIX)/share/wslu
45+
rm -f $(DESTDIR)$(PREFIX)/share/applications/wslview.desktop
4346

4447
doc:
4548
[ -d $(OUTMANPATH) ] || mkdir $(OUTMANPATH)
@@ -59,7 +62,7 @@ res_install:
5962
install -Dm 644 src/etc/*.ps1 -t $(DESTDIR)$(PREFIX)/share/wslu
6063
install -Dm 644 src/etc/*.ico -t $(DESTDIR)$(PREFIX)/share/wslu
6164
install -Dm 755 src/etc/*.sh -t $(DESTDIR)$(PREFIX)/share/wslu
62-
install -Dm 644 src/etc/*.desktop $(DESTDIR)$(PREFIX)/share/wslu
65+
install -Dm 644 src/etc/wslview.desktop -t $(DESTDIR)$(PREFIX)/share/applications
6366
install -Dm 644 src/etc/conf $(DESTDIR)$(PREFIX)/share/wslu
6467

6568
conf_install:

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1.3-1
1+
4.1.4-1

‎src/wslu-header‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,14 @@ if __wsl_conf_read interop enabled | grep false >/dev/null; then
7878
2. under [interop] section, set enabled to true;
7979
3. restart your distribution."
8080
exit 1
81-
elif grep ^disabled /proc/sys/fs/binfmt_misc/WSLInterop >/dev/null; then
82-
echo -e "WSL Interopability is temporarily disabled and WSL Utilities won't work. Please enable it by:
83-
# echo 1 > /proc/sys/fs/binfmt_misc/WSLInterop"
84-
exit 1
81+
elif [ -f /proc/sys/fs/binfmt_misc/WSLInterop ] && grep -q '^disabled' /proc/sys/fs/binfmt_misc/WSLInterop; then
82+
echo "WSL Interopability is temporarily disabled and WSL Utilities won't work. Please enable it by:
83+
# echo 1 > /proc/sys/fs/binfmt_misc/WSLInterop"
84+
exit 1
85+
elif [ -f /proc/sys/fs/binfmt_misc/WSLInterop-late ] && grep -q '^disabled' /proc/sys/fs/binfmt_misc/WSLInterop-late; then
86+
echo "WSL Interopability is temporarily disabled and WSL Utilities won't work. Please enable it by:
87+
# echo 1 > /proc/sys/fs/binfmt_misc/WSLInterop-late"
88+
exit 1
8589
fi
8690

8791
# when --verbose, verbose; when --debug, debug.

0 commit comments

Comments
 (0)