marcel/winapps
1
0
Fork 0
mirror of https://github.com/winapps-org/winapps.git synced 2025-09-14 21:49:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: chmod *after* copying

Browse Source 
Closes #711

Signed-off-by: Oskar Manhart <52569953+oskardotglobal@users.noreply.github.com>
This commit is contained in:
Oskar Manhart
2025-09-04 19:35:22 +02:00
parent 5104e0d400
commit bc8ac155d4
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/winapps/setup.patch
View File

@@ -1,5 +1,5 @@
diff --git a/setup.sh b/setup.sh
index d514bcc..ff53ead 100755
index 3a871c8..71a8fa0 100755
--- a/setup.sh
+++ b/setup.sh
@@ -39,8 +39,8 @@ readonly SYS_BIN_PATH="/usr/local/bin" # UNIX path to 'bin' dir
@@ -68,7 +68,7 @@ index d514bcc..ff53ead 100755
# Complete the previous line.
echo -e "${FAIL_TEXT}Failed!${CLEAR_TEXT}\n"
@@ -1242,11 +1222,11 @@ function waConfigureWindows() {
@@ -1239,11 +1219,11 @@ function waConfigureWindows() {
# Populate variables.
WIN_BASH="\
#!/usr/bin/env bash
@@ -82,7 +82,7 @@ index d514bcc..ff53ead 100755
Terminal=false
Type=Application
Icon=${APPDATA_PATH}/icons/windows.svg
@@ -1293,13 +1273,13 @@ function waConfigureApp() {
@@ -1290,13 +1270,13 @@ function waConfigureApp() {
# Determine the content of the bash script for the application.
APP_BASH="\
#!/usr/bin/env bash
@@ -98,16 +98,17 @@ index d514bcc..ff53ead 100755
Terminal=false
Type=Application
Icon=${APP_ICON}
@@ -1349,6 +1329,8 @@ function waConfigureOfficiallySupported() {
@@ -1364,7 +1344,9 @@ function waConfigureOfficiallySupported() {
fi
# Copy the protocol handler to the appropriate directory.
+ # Fix permissions for nix.
+ $SUDO chmod u+w "$TARGET_DIR/ms-office-protocol-handler.desktop"
$SUDO cp "./apps/ms-office-protocol-handler.desktop" "$TARGET_DIR/ms-office-protocol-handler.desktop"
+ $SUDO chmod u+w "$TARGET_DIR/ms-office-protocol-handler.desktop"
fi
@@ -1566,7 +1548,7 @@ function waInstall() {
# Print feedback.
@@ -1596,7 +1578,7 @@ function waInstall() {
echo -e "${BOLD_TEXT}Installing WinApps.${CLEAR_TEXT}"
# Check for existing conflicting WinApps installations.
@@ -116,21 +117,19 @@ index d514bcc..ff53ead 100755
# Load the WinApps configuration file.
waLoadConfig
@@ -1635,8 +1617,11 @@ function waInstall() {
@@ -1664,9 +1646,8 @@ function waInstall() {
# Check for installed applications.
waFindInstalled
# Install the WinApps bash scripts.
- # Install the WinApps bash scripts.
- $SUDO ln -sf "${SOURCE_PATH}/bin/winapps" "${BIN_PATH}/winapps"
- $SUDO ln -sf "${SOURCE_PATH}/setup.sh" "${BIN_PATH}/winapps-setup"
+
+
+
+ # Fix permissions for nix.
+ $SUDO chmod u+w -R "${APPDATA_PATH}"
# Configure the Windows RDP session application launcher.
waConfigureWindows
@@ -1697,18 +1682,15 @@ function waUninstall() {
@@ -1727,18 +1708,15 @@ function waUninstall() {
local DESKTOP_FILE_NAME="" # Stores the name of the '.desktop' file for the application.
local BASH_SCRIPT_NAME="" # Stores the name of the application.
@@ -151,7 +150,7 @@ index d514bcc..ff53ead 100755
# Remove each '.desktop' file.
for DESKTOP_FILE_PATH in "${WINAPPS_DESKTOP_FILES[@]}"; do
@@ -1729,7 +1711,7 @@ function waUninstall() {
@@ -1759,7 +1737,7 @@ function waUninstall() {
done
# Store the paths of bash scripts calling 'WinApps' to launch specific applications in an array, returning an empty array if no such files exist.
@@ -160,7 +159,7 @@ index d514bcc..ff53ead 100755
# Remove each bash script.
for BASH_SCRIPT_PATH in "${WINAPPS_APP_BASH_SCRIPTS[@]}"; do
@@ -1750,10 +1732,9 @@ function waUninstall() {
@@ -1780,10 +1758,9 @@ function waUninstall() {
done
# Print caveats.