Skip to content

Commit

Permalink
Up-port LTS fixes and improvements to dev branch
Browse files Browse the repository at this point in the history
  • Loading branch information
patrick330602 committed Sep 14, 2020
2 parents c7115f6 + 863e942 commit d5fd2b1
Show file tree
Hide file tree
Showing 44 changed files with 401 additions and 190 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pkgbuild.yml
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- develop
- dev/**
- 3.x/**
- lts/**
jobs:
debbuild:
name: Debian
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
@@ -1,3 +0,0 @@
[submodule "extras/bats"]
path = extras/bats
url = https://github.com/bats-core/bats-core.git
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Expand Up @@ -20,10 +20,12 @@ sudo make res_install
wslu
|-src
| |-etc
| | |-wslview.desktop: XDG-style app definition for wslview
| | |-wsl.ico: legacy default icon for wslusc
| | |-wsl-gui.ico: default icon for wslusc GUI shortcut
| | |-wsl-term.ico: default icon for wslusc cli shortcut
| | |-sudo.ps1: helper script for wslgsu
| | |-sudo.ps1: helper script for wslgsu
| | |-get_dpi.ps1: helper script for dpi function in wslsys
| | |-wslsc-helper.sh: helper script for wslusc on WSL side
| | \-runHidden.vbs: helper script for wslusc on Windows side
| |-wslu-header: Header file of all script
Expand Down
1 change: 1 addition & 0 deletions Makefile
Expand Up @@ -59,6 +59,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

clean:
rm -rf $(OUTPATH)
Expand Down
12 changes: 6 additions & 6 deletions README.eo.md
Expand Up @@ -60,12 +60,10 @@ Aro de rapidaj agoj por WSL, kiel repide surmeti ĉiujn Vindozajn diskingojn aŭ

### Alpine Linux

Oni povas instali `wslu` el **Alpine Linux community** per la jenaj komandoj:
Oni povas instali `wslu` el **Alpine Linux 3.12+** per la jenaj komandoj:

```
$ echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/community/" | sudo tee -a /etc/apk/repositories
$ sudo apk update
$ sudo apk add wslu@testing
sudo apk add wslu
```

### Arch Linux
Expand Down Expand Up @@ -133,15 +131,17 @@ sudo yum install wslu

> Attenu!
>
> La Ubuntu versio de `wslu` estas modifita versio. Oni devas raporti cimojn [ĉi tie](https://bugs.launchpad.net/ubuntu/+source/wslu).
> Por Ubuntu versio, Oni devas ne nur raporti cimojn ĉi tie sed ankaŭ raporti cimojn ĉe [Launchpad](https://bugs.launchpad.net/ubuntu/+source/wslu).
Antaŭinstalita en la plej freŝa versio. Sur pli aĝaj instaloj de Ubuntu, oni povas instali `ubuntu-wsl` kiu dependas de `wslu`:
Antaŭinstalita en la plej freŝa versio. Sur pli aĝaj instaloj de Ubuntu, oni povas instali `ubuntu-wsl` kiu dependas de `wslu`: <https://launchpad.net/~wslutilities/+archive/ubuntu/wslu>

```
sudo apt update
sudo apt install ubuntu-wsl
```

Por instali la plej freŝan version antaŭ ol `wslu` atigas `main` deponejon, vi povas instali per nia PPA:

### OpenSUSE

Oni povas instali `wslu` per la jenaj komandoj:
Expand Down
12 changes: 6 additions & 6 deletions README.hans.md
Expand Up @@ -18,7 +18,7 @@

这是一套适用于 Windows 10 Linux 子系统的工具组,可以在 Windows 10 Linux 子系统下完成诸如获取 Windows 环境变量或者创建你最喜爱的 Linux 程序桌面快捷方式等工作。

需要 Windows 10 创造者更新; 部分功能需要更高版本的Windows 10;支持 WSL2。
需要 Windows 10 创造者更新部分功能需要更高版本的Windows 10;支持 WSL2。

## 功能

Expand Down Expand Up @@ -58,12 +58,10 @@

### Alpine Linux

你可以用以下命令安装 `wslu`
你可以用以下命令从 **Alpine Linux 3.12+** 安装 `wslu`

```
$ echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/community/" | sudo tee -a /etc/apk/repositories
$ sudo apk update
$ sudo apk add wslu@testing
sudo apk add wslu
```

### Arch Linux
Expand Down Expand Up @@ -131,7 +129,7 @@ sudo yum install wslu

> 注意!
>
> Ubuntu 版本的 `wslu` 为修改版。你需要在[](https://bugs.launchpad.net/ubuntu/+source/wslu)反馈 Ubuntu 版问题
> Ubuntu 版本不仅需要需要在此反馈, 同时也要在 [Launchpad](https://bugs.launchpad.net/ubuntu/+source/wslu) 反馈
最新版本已预装。针对旧版本的安装,请安装依赖于 wslu 的 ubuntu-wsl:

Expand All @@ -140,6 +138,8 @@ sudo apt update
sudo apt install ubuntu-wsl
```

在最新版 `wslu` 进入 `main` 仓库前,请从以下 PPA 安装: <https://launchpad.net/~wslutilities/+archive/ubuntu/wslu>

### OpenSUSE

你可以用以下命令安装 `wslu`
Expand Down
10 changes: 5 additions & 5 deletions README.hant.md
Expand Up @@ -18,7 +18,7 @@

這是一套適用於 Windows 10 Linux 子系統的工具組,可以在 Windows 10 Linux 子系統下完成諸如獲取 Windows 環境變數或者建立你最喜愛的 Linux 程式桌面捷徑等工作。

需要 Windows 10 創造者更新; 部分功能需要更高版本的Windows 10;支援 WSL2。
需要 Windows 10 創造者更新部分功能需要更高版本的Windows 10;支援 WSL2。

## 功能

Expand Down Expand Up @@ -59,12 +59,10 @@

### Alpine Linux

你可以用以下指令安裝 `wslu`
你可以用以下指令通過 **Alpine Linux 3.12+** 安裝 `wslu`

```
$ echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/community/" | sudo tee -a /etc/apk/repositories
$ sudo apk update
$ sudo apk add wslu@testing
sudo apk add wslu
```

### Arch Linux
Expand Down Expand Up @@ -141,6 +139,8 @@ sudo apt update
sudo apt install ubuntu-wsl
```

在最新版 `wslu` 進入 `main` 倉庫前,請從以下 PPA 安裝: <https://launchpad.net/~wslutilities/+archive/ubuntu/wslu>

### OpenSUSE

你可以用以下指令安装 `wslu`
Expand Down
10 changes: 5 additions & 5 deletions README.md
Expand Up @@ -58,12 +58,10 @@ A set of quick actions for WSL such as quickly mounting all drives or manually s

### Alpine Linux

You can install `wslu` from Alpine Linux community with the following command:
You can install `wslu` on **Alpine Linux 3.12+** with the following command:

```
$ echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/community/" | sudo tee -a /etc/apk/repositories
$ sudo apk update
$ sudo apk add wslu@testing
sudo apk add wslu
```

### Arch Linux
Expand Down Expand Up @@ -131,7 +129,7 @@ sudo yum install wslu

> Attention!
>
> The Ubuntu version of `wslu` is a modified version. You should report bug [here](https://bugs.launchpad.net/ubuntu/+source/wslu).
> For Ubuntu version, you should not only report bug here but also report bug at [Launchpad](https://bugs.launchpad.net/ubuntu/+source/wslu).
Preinstalled in the latest apps. On older installations of Ubuntu please install `ubuntu-wsl` that depends on `wslu`:

Expand All @@ -140,6 +138,8 @@ sudo apt update
sudo apt install ubuntu-wsl
```

To install the latest version before `wslu` reaches `main` reporsitory, you can install via our PPA: <https://launchpad.net/~wslutilities/+archive/ubuntu/wslu>

### OpenSUSE

You can install `wslu` with the following command:
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
4.0.0-1
4.0.0-1
11 changes: 6 additions & 5 deletions docs/wslact.1
Expand Up @@ -13,7 +13,7 @@ Currently, we have two features available:
.in +4n
.nf
\fBts, time-sync\fR \- Time Sync
\fBsm, smart-mount\fR \- Smart Mounting
\fBsm, auto-mount\fR \- Auto Mounting
.fi
.in
.SH COMMANDS
Expand All @@ -31,11 +31,11 @@ OPTIONS
print a simple help.
.in
.fi
.SS "Smart Mounting"
Smart Mounting (\fIsmart-mount\fR) feature allows you to mount all drives available on Windows to WSL. Requires sudo.
.SS "Auto Mounting"
Smart Mounting (\fIauto-mount\fR) feature allows you to mount all drives available on Windows to WSL. Requires sudo.
.TP
SYNOPSIS
.B wslact smart-mount
.B wslact auto-mount
.RB [ \-h ]
.TP
OPTIONS
Expand All @@ -61,7 +61,8 @@ print current version.
.SH AUTHOR
Created by Patrick Wu <me@patrickwu.space>
.SH REPORTING BUGS
Report bugs to <https://github.com/wslutilities/wslu/issues>
Report bugs to <https://github.com/wslutilities/wslu/issues>;
For Ubuntu specific/related bugs, report to <https://bugs.launchpad.net/ubuntu/+source/wslu>.
.SH COPYRIGHT
This is free software; you can redistribute it and/or modify it under
the terms of the GNU GPL version 3 or (at your option) any later
Expand Down
3 changes: 2 additions & 1 deletion docs/wslfetch.1
Expand Up @@ -26,7 +26,8 @@ add a colorbar to the printed information.
.SH AUTHOR
Created by Patrick Wu <me@patrickwu.space>
.SH REPORTING BUGS
Report bugs to <https://github.com/wslutilities/wslu/issues>
Report bugs to <https://github.com/wslutilities/wslu/issues>;
For Ubuntu specific/related bugs, report to <https://bugs.launchpad.net/ubuntu/+source/wslu>.
.SH COPYRIGHT
This is free software; you can redistribute it and/or modify it under
the terms of the GNU GPL version 3 or (at your option) any later
Expand Down
5 changes: 3 additions & 2 deletions docs/wslsys.1
Expand Up @@ -4,7 +4,7 @@
- Component of Windows 10 Linux Subsystem Utility
.SH SYNOSIS
.B wslsys
.RB [ \-IbBFUWRKPSlt ]
.RB [ \-VIbBFUWRKPSlt ]
.RB [ \-s ]
.PP
.B wslsys
Expand Down Expand Up @@ -77,7 +77,8 @@ For example, \fB"light"\fR.
.SH AUTHOR
Created by Patrick Wu <me@patrickwu.space>
.SH REPORTING BUGS
Report bugs to <https://github.com/wslutilities/wslu/issues>
Report bugs to <https://github.com/wslutilities/wslu/issues>;
For Ubuntu specific/related bugs, report to <https://bugs.launchpad.net/ubuntu/+source/wslu>.
.SH COPYRIGHT
This is free software; you can redistribute it and/or modify it under
the terms of the GNU GPL version 3 or (at your option) any later
Expand Down
7 changes: 4 additions & 3 deletions docs/wslu.7
Expand Up @@ -10,7 +10,7 @@ This is a collection of utilities for Windows 10 Linux Subsystem, such as enabli
- Kali Linux
- OpenSUSE Leap 42, 12.0 and 15.0
- SUSE Linux Enterprise Server 12 and 15
- Ubuntu Latest, 16.04 LTS and 18.04 LTS
- Ubuntu Latest, 16.04 LTS, 18.04 LTS and 20.04 LTS
- Pengwin(Formerly WLinux)
.fi

Expand Down Expand Up @@ -68,10 +68,11 @@ unsupported feature (for a distro)
.B 40
Unknown system input.
.SH BUG
Report bugs to https://github.com/wslutilities/wslu/issues.
Report bugs to <https://github.com/wslutilities/wslu/issues>;
For Ubuntu specific/related bugs, report to <https://bugs.launchpad.net/ubuntu/+source/wslu>.
.SH COPYRIGHT
This is free software; you can redistribute it and/or modify it under the terms of the GNU GPL version 3 or (at your option) any later version. There is NO warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Logo of WSL Utilities and wslusc icons is licensed under CC BY 4.0 International License.

For third-party license, please refer to https://wslutiliti.es/wslu/licenses.
For third-party license, please refer to <https://wslutiliti.es/wslu/licenses.html>.
5 changes: 4 additions & 1 deletion docs/wslupath.1
Expand Up @@ -62,7 +62,10 @@ print available registry input
.SH AUTHOR
Created by Patrick Wu <me@patrickwu.space>
.SH REPORTING BUGS
Report bugs to <https://github.com/wslutilities/wslu/issues>
Report bugs to <https://github.com/wslutilities/wslu/issues>;
For Ubuntu specific/related bugs, report to <https://bugs.launchpad.net/ubuntu/+source/wslu>.
.PP
.B However, keep in mind this tool is deprecated and bugs reported for this tool will have a high chance to be ignored.
.SH COPYRIGHT
This is free software; you can redistribute it and/or modify it under
the terms of the GNU GPL version 3 or (at your option) any later
Expand Down
3 changes: 2 additions & 1 deletion docs/wslusc.1
Expand Up @@ -42,7 +42,8 @@ interactive mode.
.SH AUTHOR
Created by Patrick Wu <me@patrickwu.space>
.SH REPORTING BUGS
Report bugs to <https://github.com/wslutilities/wslu/issues>
Report bugs to <https://github.com/wslutilities/wslu/issues>;
For Ubuntu specific/related bugs, report to <https://bugs.launchpad.net/ubuntu/+source/wslu>.
.SH COPYRIGHT
This is free software; you can redistribute it and/or modify it under
the terms of the GNU GPL version 3 or (at your option) any later
Expand Down
3 changes: 2 additions & 1 deletion docs/wslvar.1
Expand Up @@ -34,7 +34,8 @@ show available Shell folder environment variables.
.SH AUTHOR
Created by Patrick Wu <me@patrickwu.space>
.SH REPORTING BUGS
Report bugs to <https://github.com/wslutilities/wslu/issues>
Report bugs to <https://github.com/wslutilities/wslu/issues>;
For Ubuntu specific/related bugs, report to <https://bugs.launchpad.net/ubuntu/+source/wslu>.
.SH COPYRIGHT
This is free software; you can redistribute it and/or modify it under
the terms of the GNU GPL version 3 or (at your option) any later
Expand Down
3 changes: 2 additions & 1 deletion docs/wslview.1
Expand Up @@ -27,7 +27,8 @@ register \fBwslview\fR as the default WSL web browser.
.SH AUTHOR
Created by Patrick Wu <me@patrickwu.space>
.SH REPORTING BUGS
Report bugs to <https://github.com/wslutilities/wslu/issues>
Report bugs to <https://github.com/wslutilities/wslu/issues>;
For Ubuntu specific/related bugs, report to <https://bugs.launchpad.net/ubuntu/+source/wslu>.
.SH COPYRIGHT
This is free software; you can redistribute it and/or modify it under
the terms of the GNU GPL version 3 or (at your option) any later
Expand Down
1 change: 0 additions & 1 deletion extras/bats
Submodule bats deleted from 73b8d2
2 changes: 1 addition & 1 deletion extras/build/alpine/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Patrick Wu <me@patrickwu.space>
# Contributor: Patrick Wu <me@patrickwu.space>
pkgname=wslu
pkgver=3.0.1
pkgver=3.2.1
pkgrel=0
pkgdesc="A collection of utilities for Windows 10 Linux Subsystems"
url="https://github.com/wslutilities/wslu"
Expand Down
5 changes: 5 additions & 0 deletions extras/build/alpine/wslu.post-install
@@ -0,0 +1,5 @@
#!/bin/sh

date +"%s" | tee /usr/share/wslu/updated_time >/dev/null

exit 0
5 changes: 5 additions & 0 deletions extras/build/alpine/wslu.post-upgrade
@@ -0,0 +1,5 @@
#!/bin/sh

date +"%s" | tee /usr/share/wslu/updated_time >/dev/null

exit 0
3 changes: 3 additions & 0 deletions extras/build/alpine/wslu.pre-deinstall
@@ -0,0 +1,3 @@
#!/bin/sh

rm /usr/share/wslu/updated_time
2 changes: 1 addition & 1 deletion extras/build/arch/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Patrick Wu <me@patrickwu.space>

pkgname=wslu
pkgver=3.0.1
pkgver=3.2.1
pkgrel=0
pkgdesc="A collection of utilities for Windows 10 Linux Subsystems"
arch=('any')
Expand Down
36 changes: 36 additions & 0 deletions extras/build/arch/wslu.install
@@ -0,0 +1,36 @@
# This is a default template for a post-install scriptlet.
# Uncomment only required functions and remove any functions
# you don't need (and this header).

## arg 1: the new package version
#pre_install() {
# do something here
#}

## arg 1: the new package version
post_install() {
date +"%s" | tee /usr/share/wslu/updated_time >/dev/null
}

## arg 1: the new package version
## arg 2: the old package version
#pre_upgrade() {
# do something here
#}

## arg 1: the new package version
## arg 2: the old package version
post_upgrade() {
date +"%s" | tee /usr/share/wslu/updated_time >/dev/null
}

## arg 1: the old package version
pre_remove() {
# do something here
rm /usr/share/wslu/updated_time
}

## arg 1: the old package version
#post_remove() {
# do something here
#}
2 changes: 1 addition & 1 deletion extras/build/debian/control
Expand Up @@ -10,6 +10,6 @@ Vcs-Git: https://github.com/wslutilities/wslu.git

Package: wslu
Architecture: all
Depends: bc, imagemagick
Depends: bc, imagemagick, desktop-file-utils
Description: A collection of utilities for Windows 10 Linux Subsystem
This is a collection of utilities for Windows 10 Linux Subsystem, such as converting WSL path to Windows path or creating your favorite linux app shortcuts on Windows 10 Desktop. Requires Windows 10 Creators Update and higher.

0 comments on commit d5fd2b1

Please sign in to comment.