Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update call_windows_uptime to actually work #182

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .github/actions/rpmbuild/Dockerfile

This file was deleted.

11 changes: 0 additions & 11 deletions .github/actions/rpmbuild/action.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/workflows/manpage.yml

This file was deleted.

99 changes: 0 additions & 99 deletions .github/workflows/pkgdeploy.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions .github/workflows/tests.yml

This file was deleted.

6 changes: 6 additions & 0 deletions README.hant.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,13 @@
你可以用以下指令通過 **Alpine Linux 3.12+** 安裝 `wslu`:

```
<<<<<<< HEAD
$ echo "@testing https://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
>>>>>>> lts/master
```

### Arch Linux
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2-1
3.2.2-1
48 changes: 48 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
wslu (3.2.1-0kali1) kali-dev; urgency=medium

* header: improvements on the system drive detection. (closes #133)
* tests: update the test system and tests. (closes #125)
* wslact: add back-compatibility for the auto-mounting feature.
* wslview: fix an issue when handling http/https
* wslview: fix a bug that it won't open file:///mnt/c/... or /mnt/c/...
* wslusc: fix an issue that wsl.exe execute with wrongly passed param (close #138)
* wslusc: fix the problem that the previous version that GUI shortcut generated won't work.
* wslsys: fix an issue that the WSL Version shown is wrong.
* Includes a wslview.desktop (PR #143 and #146)
* Update the script to fix badly generated shortcut issue (fixes #141)
* Fix a DPI script related space issue (fixes #144)

-- Jinming Wu, Patrick <me@patrickwu.space> Wed, 23 Dec 2020 22:33:07 +0800

wslu (3.1.1-0kali1) kali-dev; urgency=medium

* project: add separate Fedora Remix support
* header: fix `ubuntu.exe` detection issue
* wslview: mistake in calling a variable (fixes #118 again)
* wslusc: always use the absolute path (fixes #129)
* wslusc: fixes a possible white space path issue
* wslusc: When TMP is empty, try TEMP

-- Jinming Wu, Patrick <me@patrickwu.space> Wed, 01 Jul 2020 22:22:53 +0800

wslu (3.1.0-0kali1) kali-dev; urgency=medium

* header: use the proper color definition
* wslfetch: new display for WSL with WSL version displayed
* wslfetch: use the proper logo for Ubuntu (Reported by @flexiondotorg)
* wslsys: add WSL version option
* wslsys: fix an issue in DPI scaling getting wrong value due to the API change in Latest fast ring insider build (Reported by @crramirez)
* wslact: adding `--mount-options` for auto-mounting feature
* wslact: fix an i18n related issue in time-sync feature (fixes #113 by @ricardosantos9521)
* wslgsu: removed temporarily
* wslgsu: limit the Windows version it can use
* wslview: properly detect all different protocols and path styles (fixes #118)
* package: fix alpine dependency issue (fixes #117)

-- Jinming Wu, Patrick <me@patrickwu.space> Wed, 13 May 2020 22:53:03 +0800

wslu (3.0.1-0kali1) kali-dev; urgency=medium

* Initial release

-- Jinming Wu, Patrick <me@patrickwu.space> Mon, 13 Apr 2020 20:41:40 +0800
File renamed without changes.
5 changes: 3 additions & 2 deletions extras/build/debian/control → debian/control
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
Source: wslu
Section: utils
Priority: optional
Maintainer: Jinming Wu, Patrick <me@patrickwu.space>
Maintainer: Kali Developers <devel@kali.org>
Uploader: Jinming Wu, Patrick <me@patrickwu.space>
Build-Depends: debhelper (>= 11), gzip, make
Standards-Version: 4.1.3
Homepage: https://wslutiliti.es/wslu
Vcs-Browser: https://github.com/wslutilities/wslu
Vcs-Git: https://github.com/wslutilities/wslu.git

Package: wslu
Architecture: all
Architecture: amd64 arm64
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.
8 changes: 8 additions & 0 deletions debian/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: wslu
Source: https://github.com/wslutilities/wslu

Files: *
Copyright: 2020 Jinming Wu, Patrick <me@patrickwu.space>
License: GPL-3
/usr/share/common-licenses/GPL-3
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions debian/watch
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
version=4
opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/wslu-$1\.tar\.gz/ \
https://github.com/wslutilities/wslu/tags .*/v?(\d\S*)\.tar\.gz
5 changes: 0 additions & 5 deletions extras/build/debian/changelog

This file was deleted.

19 changes: 0 additions & 19 deletions extras/build/debian/copyright

This file was deleted.

38 changes: 0 additions & 38 deletions extras/scripts/wslu-install

This file was deleted.

31 changes: 0 additions & 31 deletions extras/scripts/wslu-uninstall

This file was deleted.

2 changes: 1 addition & 1 deletion src/wslsys.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function call_display_scaling() {
}

function call_windows_uptime() {
win_uptime=$(winps_exec "((get-date) - (gcim Win32_OperatingSystem).LastBootUpTime).TotalSeconds" | sed -e 's|\r||g')
win_uptime=$(winps_exec "[int64]((get-date) - (gcim Win32_OperatingSystem).LastBootUpTime).TotalSeconds" | sed -e 's|\r||g')
win_uptime=${win_uptime//.*}
w_days=$((win_uptime/86400))
w_hours=$((win_uptime/3600%24))
Expand Down
2 changes: 1 addition & 1 deletion src/wslu-header
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

# Version
wslu_version=VERSIONPLACEHOLDER
wslu_version=3.0.1-1

# Speed up script by not using unicode.
LC_ALL=C
Expand Down