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.

Sign up for GitHub

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

Jump to bottom

make wslview always use wslpath #201

Merged
merged 9 commits into from
Oct 4, 2021
Merged

make wslview always use wslpath #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3851d22
Merge pull request #190 from wslutilities/lts/master
patrick330602 May 19, 2021
2058134
Merge pull request #191 from wslutilities/lts/master
patrick330602 May 20, 2021
8724a0d
Merge pull request #192 from wslutilities/lts/master
patrick330602 May 21, 2021
89dbe4a
Update README.md
patrick330602 Jun 14, 2021
b012c86
Corrected the name of Fedora Remix and Pengwin Enterprise
crramirez Jun 14, 2021
7894810
Merge pull request #194 from crramirez/patch-5
patrick330602 Jun 15, 2021
bc88950
Change due to the deprecation of apt-key
patrick330602 Jun 20, 2021
ae55819
make wslview always use wslpath
IsaacOscar Sep 3, 2021
fabf1b9
Support opening non-files for wslview
IsaacOscar Sep 21, 2021
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: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ You can install `wslu` with the following command:

```
sudo apt install gnupg2 apt-transport-https
wget -O - https://access.patrickwu.space/wslu/public.asc | sudo apt-key add -
echo "deb https://access.patrickwu.space/wslu/debian buster main" | sudo tee -a /etc/apt/sources.list
wget -O - https://pkg.wslutiliti.es/public.key | sudo tee -a /etc/apt/trusted.gpg.d/wslu.asc
echo "deb https://pkg.wslutiliti.es/debian buster main" | sudo tee -a /etc/apt/sources.list
sudo apt update
sudo apt install wslu
```
Expand All @@ -99,7 +99,7 @@ sudo dnf copr enable wslutilities/wslu
sudo dnf install wslu
```

### Fedora Remix
### Fedora Remix for WSL

Preinstalled.

Expand All @@ -109,8 +109,8 @@ You can install `wslu` with the following command:

```
sudo apt install gnupg2 apt-transport-https
wget -O - https://access.patrickwu.space/wslu/public.asc | sudo apt-key add -
echo "deb https://access.patrickwu.space/wslu/kali kali-rolling main" | sudo tee -a /etc/apt/sources.list
wget -O - https://pkg.wslutiliti.es/public.key | sudo tee -a /etc/apt/trusted.gpg.d/wslu.asc
echo "deb https://pkg.wslutiliti.es/kali kali-rolling main" | sudo tee -a /etc/apt/sources.list
sudo apt update
sudo apt install wslu
```
Expand All @@ -119,7 +119,7 @@ sudo apt install wslu

Preinstalled.

### Pengwin Enterprise
### Pengwin Enterprise 7

You can install `wslu` with the following command:

Expand Down
14 changes: 1 addition & 13 deletions src/wslview.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,28 +42,16 @@ if [[ "$lname" != "" ]]; then
if [[ "$lname" =~ ^file:\/\/.*$ ]] && [[ ! "$lname" =~ ^file:\/\/(\/)+[A-Za-z]\:.*$ ]]; then
[ $wslutmpbuild -ge "$BN_MAY_NINETEEN" ] || error_echo "This protocol is not supported before version 1903." 34
properfile_full_path="$(readlink -f "${lname//file:\/\//}")"
interop_win_type="$(interop_prefix)$(sysdrive_prefix)"
converted_file_path="\\\\wsl\$\\$WSL_DISTRO_NAME${properfile_full_path//\//\\}"
[[ "$properfile_full_path" =~ ^${interop_win_type//\/$/}.*$ ]] && converted_file_path="$(wslpath -w "$properfile_full_path")"
lname="$converted_file_path"
# Linux absolute path
elif [[ "$lname" =~ ^(/[^/]+)*(/)?$ ]]; then
[ $wslutmpbuild -ge "$BN_MAY_NINETEEN" ] || error_echo "This protocol is not supported before version 1903." 34
properfile_full_path="$(readlink -f "${lname}")"
interop_win_type="$(interop_prefix)$(sysdrive_prefix)"
converted_file_path="\\\\wsl\$\\$WSL_DISTRO_NAME${properfile_full_path//\//\\}"
[[ "$properfile_full_path" =~ ^${interop_win_type//\/$/}.*$ ]] && converted_file_path="$(wslpath -w "$properfile_full_path")"
lname="$converted_file_path"
# Linux relative path
elif [[ -d "$(readlink -f "$lname")" ]] || [[ -f "$(readlink -f "$lname")" ]]; then
[ $wslutmpbuild -ge "$BN_MAY_NINETEEN" ] || error_echo "This protocol is not supported before version 1903." 34
properfile_full_path="$(readlink -f "${lname}")"
interop_win_type="$(interop_prefix)$(sysdrive_prefix)"
converted_file_path="\\\\wsl\$\\$WSL_DISTRO_NAME${properfile_full_path//\//\\}"
[[ "$properfile_full_path" =~ ^${interop_win_type//\/$/}.*$ ]] && converted_file_path="$(wslpath -w "$properfile_full_path")"
lname="$converted_file_path"
fi
winps_exec Start "\"$lname\""
winps_exec Start "\"$(wslpath -w "$properfile_full_path" 2>/dev/null || echo "$lname")\""
else
error_echo "No input, aborting" 21
fi