From 58c66679ab88802ed4019f40e73208f0857f0d99 Mon Sep 17 00:00:00 2001 From: Gordon Cheong <83162188+gordoncheong@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:11:04 +0800 Subject: [PATCH 1/5] Fixing Uninstallation Failure --- setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index 7b59eaa..c82e430 100755 --- a/setup.sh +++ b/setup.sh @@ -1673,7 +1673,7 @@ function waUninstall() { local BASH_SCRIPT_NAME="" # Stores the name of the application. # Remove the 'WinApps' bash scripts. - $SUDO rm -f "${BIN_PATH}/winapps" + $SUDO rm -rf "${BIN_PATH}/winapps" $SUDO rm -f "${BIN_PATH}/winapps-setup" # Remove WinApps configuration data, temporary files and logs. From 1613faba04c0b83dbe29c923bcd794952017a318 Mon Sep 17 00:00:00 2001 From: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com> Date: Sun, 8 Sep 2024 11:27:56 +0200 Subject: [PATCH 2/5] fix: rename source directory to winapps-src --- setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.sh b/setup.sh index c82e430..e91bc93 100755 --- a/setup.sh +++ b/setup.sh @@ -38,8 +38,8 @@ readonly SYS_BIN_PATH="/usr/local/bin" # UNIX path to 'bin' dir readonly USER_BIN_PATH="${HOME}/.local/bin" # UNIX path to 'bin' directory for a '--user' WinApps installation. readonly USER_BIN_PATH_WIN='\\tsclient\home\.local\bin' # WINDOWS path to 'bin' directory for a '--user' WinApps installation. # 'SOURCE' -readonly SYS_SOURCE_PATH="${SYS_BIN_PATH}/winapps" # UNIX path to WinApps source directory for a '--system' WinApps installation. -readonly USER_SOURCE_PATH="${USER_BIN_PATH}/winapps" # UNIX path to WinApps source directory for a '--system' WinApps installation. +readonly SYS_SOURCE_PATH="${SYS_BIN_PATH}/winapps-src" # UNIX path to WinApps source directory for a '--system' WinApps installation. +readonly USER_SOURCE_PATH="${USER_BIN_PATH}/winapps-src" # UNIX path to WinApps source directory for a '--system' WinApps installation. # 'APP' readonly SYS_APP_PATH="/usr/share/applications" # UNIX path to 'applications' directory for a '--system' WinApps installation. readonly USER_APP_PATH="${HOME}/.local/share/applications" # UNIX path to 'applications' directory for a '--user' WinApps installation. @@ -1673,7 +1673,7 @@ function waUninstall() { local BASH_SCRIPT_NAME="" # Stores the name of the application. # Remove the 'WinApps' bash scripts. - $SUDO rm -rf "${BIN_PATH}/winapps" + $SUDO rm -f "${BIN_PATH}/winapps" $SUDO rm -f "${BIN_PATH}/winapps-setup" # Remove WinApps configuration data, temporary files and logs. From e6d04bf8e0815899ef2a474f4cb1ff6a74d4bc52 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 8 Sep 2024 23:19:32 -0400 Subject: [PATCH 3/5] Support old windows versions Added a test to not error out when the Appx cmdlets are not available (like in the windows 7 box i am using). I had some install issues with creating the bin links so I added "-f". --- install/ExtractPrograms.ps1 | 4 +++- setup.sh | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/install/ExtractPrograms.ps1 b/install/ExtractPrograms.ps1 index 12d2c06..fcfbf3d 100644 --- a/install/ExtractPrograms.ps1 +++ b/install/ExtractPrograms.ps1 @@ -329,6 +329,8 @@ Write-Output 'ICONS=()' # Search for installed applications. AppSearchWinReg # Windows Registry -AppSearchUWP # Universal Windows Platform +if (Get-Command Get-AppxPackage -ErrorAction SilentlyContinue){ + AppSearchUWP # Universal Windows Platform +} AppSearchChocolatey # Chocolatey Package Manager AppSearchScoop # Scoop Package Manager diff --git a/setup.sh b/setup.sh index e91bc93..2ebbb50 100755 --- a/setup.sh +++ b/setup.sh @@ -1621,8 +1621,8 @@ function waInstall() { waFindInstalled # Install the WinApps bash scripts. - $SUDO ln -s "./bin/winapps" "${BIN_PATH}/winapps" - $SUDO ln -s "./setup.sh" "${BIN_PATH}/winapps-setup" + $SUDO ln -sf "${SOURCE_PATH}/bin/winapps" "${BIN_PATH}/winapps" + $SUDO ln -sf "${SOURCE_PATH}/setup.sh" "${BIN_PATH}/winapps-setup" # Configure the Windows RDP session application launcher. waConfigureWindows From 9223ffc8ed3c41592c1137fba42270b0ed15afb6 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 8 Sep 2024 23:24:15 -0400 Subject: [PATCH 4/5] Added some old apps. Added acrobat 9 and Word and Excel 2010. Acrobat in particular did not work with autodetect. --- apps/acrobat9/icon.svg | 3 ++ apps/acrobat9/info | 14 +++++++++ apps/excel-x86-2010/icon.svg | 48 +++++++++++++++++++++++++++++++ apps/excel-x86-2010/info | 14 +++++++++ apps/mspaint/icon.svg | 56 ++++++++++++++++++++++++++++++++++++ apps/mspaint/info | 14 +++++++++ apps/powershell-ide/icon.svg | 1 + apps/powershell-ide/info | 14 +++++++++ apps/word-x86-2010/icon.svg | 50 ++++++++++++++++++++++++++++++++ apps/word-x86-2010/info | 17 +++++++++++ 10 files changed, 231 insertions(+) create mode 100644 apps/acrobat9/icon.svg create mode 100644 apps/acrobat9/info create mode 100644 apps/excel-x86-2010/icon.svg create mode 100644 apps/excel-x86-2010/info create mode 100644 apps/mspaint/icon.svg create mode 100644 apps/mspaint/info create mode 100644 apps/powershell-ide/icon.svg create mode 100644 apps/powershell-ide/info create mode 100644 apps/word-x86-2010/icon.svg create mode 100644 apps/word-x86-2010/info diff --git a/apps/acrobat9/icon.svg b/apps/acrobat9/icon.svg new file mode 100644 index 0000000..9c971f6 --- /dev/null +++ b/apps/acrobat9/icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/apps/acrobat9/info b/apps/acrobat9/info new file mode 100644 index 0000000..76e8261 --- /dev/null +++ b/apps/acrobat9/info @@ -0,0 +1,14 @@ +# GNOME shortcut name +NAME="Acrobat 9" + +# Used for descriptions and window class +FULL_NAME="Acrobat 9" + +# The executable inside windows +WIN_EXECUTABLE="C:\Program Files (x86)\Adobe\Acrobat 9.0\Acrobat\Acrobat.exe" + +# GNOME categories +CATEGORIES="WinApps;Documents" + +# GNOME mimetypes +MIME_TYPES="application/pdf;" diff --git a/apps/excel-x86-2010/icon.svg b/apps/excel-x86-2010/icon.svg new file mode 100644 index 0000000..55165ee --- /dev/null +++ b/apps/excel-x86-2010/icon.svg @@ -0,0 +1,48 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/excel-x86-2010/info b/apps/excel-x86-2010/info new file mode 100644 index 0000000..e027032 --- /dev/null +++ b/apps/excel-x86-2010/info @@ -0,0 +1,14 @@ +# GNOME shortcut name +NAME="Excel" + +# Used for descriptions and window class +FULL_NAME="Microsoft Excel" + +# The executable inside windows +WIN_EXECUTABLE="C:\Program Files (x86)\Microsoft Office\Office14\EXCEL.EXE" + +# GNOME categories +CATEGORIES="WinApps;Office" + +# GNOME mimetypes +MIME_TYPES="application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.addin.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;" diff --git a/apps/mspaint/icon.svg b/apps/mspaint/icon.svg new file mode 100644 index 0000000..62d8b5d --- /dev/null +++ b/apps/mspaint/icon.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/mspaint/info b/apps/mspaint/info new file mode 100644 index 0000000..f9c91ad --- /dev/null +++ b/apps/mspaint/info @@ -0,0 +1,14 @@ +# GNOME shortcut name +NAME="Paint" + +# Used for descriptions and window class +FULL_NAME="Microsoft Paint" + +# The executable inside windows +WIN_EXECUTABLE="C:\windows\system32\mspaint.exe" + +# GNOME categories +CATEGORIES="WinApps;Graphics" + +# GNOME mimetypes +MIME_TYPES="image/png;image/bmp;image/jpeg;image/jpe;image/jpeg;image/tiff;image/tif;image/x-ms-bmp;image/dib;image/vnd.microsoft.icon;image/x-icon;image/ico;image/icon;text/ico;application/ico" diff --git a/apps/powershell-ide/icon.svg b/apps/powershell-ide/icon.svg new file mode 100644 index 0000000..6e91cf7 --- /dev/null +++ b/apps/powershell-ide/icon.svg @@ -0,0 +1 @@ + diff --git a/apps/powershell-ide/info b/apps/powershell-ide/info new file mode 100644 index 0000000..4eca7c5 --- /dev/null +++ b/apps/powershell-ide/info @@ -0,0 +1,14 @@ +# GNOME shortcut name +NAME="Powershell" + +# Used for descriptions and window class +FULL_NAME="Microsoft Powershell" + +# The executable inside windows +WIN_EXECUTABLE="C:\Windows\SysWOW64\WindowsPowerShell\v1.0\powershell.exe" + +# GNOME categories +CATEGORIES="WinApps;Windows" + +# GNOME mimetypes +MIME_TYPES="" diff --git a/apps/word-x86-2010/icon.svg b/apps/word-x86-2010/icon.svg new file mode 100644 index 0000000..9b9eb4a --- /dev/null +++ b/apps/word-x86-2010/icon.svg @@ -0,0 +1,50 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/word-x86-2010/info b/apps/word-x86-2010/info new file mode 100644 index 0000000..70f3881 --- /dev/null +++ b/apps/word-x86-2010/info @@ -0,0 +1,17 @@ +# GNOME shortcut name +NAME="Word" + +# Used for descriptions and window class +FULL_NAME="Microsoft Word" + +# The executable inside windows +WIN_EXECUTABLE="C:\Program Files (x86)\Microsoft Office\Office14\WINWORD.EXE" + +# GNOME categories +CATEGORIES="WinApps;Office" + +# GNOME mimetypes +MIME_TYPES="application/msword;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ms-word.template.macroEnabled.12;" + +# System Icon +ICON="ms-word" From 451e7e65a3bc2c2b8a3bcd2d101309f189934547 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 03:33:09 +0000 Subject: [PATCH 5/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- apps/mspaint/icon.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/mspaint/icon.svg b/apps/mspaint/icon.svg index 62d8b5d..428b29b 100644 --- a/apps/mspaint/icon.svg +++ b/apps/mspaint/icon.svg @@ -53,4 +53,4 @@ - \ No newline at end of file +