mirror of
https://github.com/winapps-org/winapps.git
synced 2025-06-21 05:43:02 +02:00
fix for application loop
This commit is contained in:
parent
bac0d08cf2
commit
c06ae550bc
8
setup.sh
8
setup.sh
@ -156,7 +156,7 @@ function waGetSourceCode() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! -d "$SOURCE_PATH" ]]; then
|
if [[ ! -d "$SOURCE_PATH" ]]; then
|
||||||
$SUDO git clone --recurse-submodules --remote-submodules https://github.com/winapps-org/winapps.git "$SOURCE_PATH"
|
$SUDO git clone --recurse-submodules --remote-submodules https://github.com/fluffy-git/winapps.git "$SOURCE_PATH"
|
||||||
else
|
else
|
||||||
echo -e "${INFO_TEXT}WinApps installation already present at ${CLEAR_TEXT}${COMMAND_TEXT}${SOURCE_PATH}${CLEAR_TEXT}${INFO_TEXT}. Updating...${CLEAR_TEXT}"
|
echo -e "${INFO_TEXT}WinApps installation already present at ${CLEAR_TEXT}${COMMAND_TEXT}${SOURCE_PATH}${CLEAR_TEXT}${INFO_TEXT}. Updating...${CLEAR_TEXT}"
|
||||||
$SUDO git -C "$SOURCE_PATH" pull --no-rebase
|
$SUDO git -C "$SOURCE_PATH" pull --no-rebase
|
||||||
@ -196,7 +196,7 @@ function waGetInquirer() {
|
|||||||
INQUIRER="/tmp/waInquirer.sh"
|
INQUIRER="/tmp/waInquirer.sh"
|
||||||
rm -f "$INQUIRER"
|
rm -f "$INQUIRER"
|
||||||
|
|
||||||
curl -o "$INQUIRER" "https://raw.githubusercontent.com/winapps-org/winapps/main/install/inquirer.sh"
|
curl -o "$INQUIRER" "https://raw.githubusercontent.com/fluffy-git/winapps/main/install/inquirer.sh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# shellcheck source=/dev/null # Exclude this file from being checked by ShellCheck.
|
# shellcheck source=/dev/null # Exclude this file from being checked by ShellCheck.
|
||||||
@ -1137,6 +1137,10 @@ function waFindInstalled() {
|
|||||||
# Extract the name of the application from the absolute path of the folder.
|
# Extract the name of the application from the absolute path of the folder.
|
||||||
APPLICATION="$(basename "$APPLICATION")"
|
APPLICATION="$(basename "$APPLICATION")"
|
||||||
|
|
||||||
|
if [[ "$APPLICATION" == "ms-office-protocol-handler.desktop" ]]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
# Source 'Info' File Containing:
|
# Source 'Info' File Containing:
|
||||||
# - The Application Name (FULL_NAME)
|
# - The Application Name (FULL_NAME)
|
||||||
# - The Shortcut Name (NAME)
|
# - The Shortcut Name (NAME)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user