marcel/winapps
1
0
Fork 0
mirror of https://github.com/winapps-org/winapps.git synced 2025-06-05 22:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

finish adding spellcheck

Browse Source
This commit is contained in:
LDprg 2024-05-24 18:14:03 +02:00
parent 7d8ae3ae3e
commit 8f259464a5
No known key found for this signature in database
GPG Key ID: D77DF2506567EC0E
4 changed files with 84 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.pre-commit-config.yaml
View File

@ -47,7 +47,7 @@ repos:
additional_dependencies: additional_dependencies:
- setuptools - setuptools
# - repo: https://github.com/shellcheck-py/shellcheck-py - repo: https://github.com/shellcheck-py/shellcheck-py
# rev: v0.10.0.1 rev: v0.10.0.1
# hooks: hooks:
# - id: shellcheck - id: shellcheck

51
bin/winapps
View File

@ -23,7 +23,7 @@ fi
function dprint() { function dprint() {
if [ "$DEBUG" = "true" ]; then if [ "$DEBUG" = "true" ]; then
echo "[$RUN] ${1}" >>"$HOME/.local/share/winapps/winapps.log" echo "[$RUN] $1" >>"$HOME/.local/share/winapps/winapps.log"
fi fi
} }
@ -59,13 +59,13 @@ else
fi fi
if [ -z "$RDP_IP" ]; then if [ -z "$RDP_IP" ]; then
if [ ! "$(groups | grep -v libvirt)" ]; then if groups | grep -vq libvirt; then
echo "You are not a member of the libvirt group. Run the below then reboot." echo "You are not a member of the libvirt group. Run the below then reboot."
echo ' sudo usermod -a -G libvirt $(whoami)' echo " sudo usermod -a -G libvirt $(whoami)"
echo ' sudo usermod -a -G kvm $(whoami)' echo " sudo usermod -a -G kvm $(whoami)"
exit exit
fi fi
if [ ! "$(virsh list | grep -v RDPWindows)" ]; then if virsh list | grep -vq RDPWindows; then
echo "RDPWindows is not running, run:" echo "RDPWindows is not running, run:"
echo " virsh start RDPWindows" echo " virsh start RDPWindows"
exit exit
@ -75,39 +75,39 @@ if [ -z "$RDP_IP" ]; then
fi fi
dprint "1:${1}" dprint "1:$1"
dprint "2:$2" dprint "2:$2"
# this is just for debug logging anyways # this is just for debug logging anyways
# shellcheck disable=SC2145 # shellcheck disable=SC2145
dprint "@:${@}" dprint "@:${@}"
MULTI_FLAG="+span" MULTI_FLAG="+span"
if [ "${MULTIMON}" = "true" ]; then if [ "$MULTIMON" = "true" ]; then
MULTI_FLAG="/multimon" MULTI_FLAG="/multimon"
fi fi
if [ "${1}" = "windows" ]; then if [ "$1" = "windows" ]; then
$FREERDP_COMMAND $RDP_FLAGS /d:"$RDP_DOMAIN" /u:"$RDP_USER" /p:"$RDP_PASS" /scale:$RDP_SCALE +dynamic-resolution +auto-reconnect +home-drive /wm-class:"Microsoft Windows" /v:$RDP_IP 1>/dev/null 2>&1 & $FREERDP_COMMAND "$RDP_FLAGS" /d:"$RDP_DOMAIN" /u:"$RDP_USER" /p:"$RDP_PASS" /scale:$RDP_SCALE +dynamic-resolution +auto-reconnect +home-drive /wm-class:"Microsoft Windows" /v:"$RDP_IP" 1>/dev/null 2>&1 &
elif [ "${1}" = "check" ]; then elif [ "$1" = "check" ]; then
dprint "CHECK" dprint "CHECK"
$FREERDP_COMMAND $RDP_FLAGS /d:"$RDP_DOMAIN" /u:"$RDP_USER" /p:"$RDP_PASS" /scale:$RDP_SCALE +auto-reconnect +home-drive -wallpaper +dynamic-resolution $MULTI_FLAG /app:program:"explorer.exe" /v:$RDP_IP $FREERDP_COMMAND "$RDP_FLAGS" /d:"$RDP_DOMAIN" /u:"$RDP_USER" /p:"$RDP_PASS" /scale:$RDP_SCALE +auto-reconnect +home-drive -wallpaper +dynamic-resolution $MULTI_FLAG /app:program:"explorer.exe" /v:"$RDP_IP"
elif [ "${1}" = "manual" ]; then elif [ "$1" = "manual" ]; then
dprint "MANUAL:$2" dprint "MANUAL:$2"
$FREERDP_COMMAND $RDP_FLAGS /d:"$RDP_DOMAIN" /u:"$RDP_USER" /p:"$RDP_PASS" /scale:$RDP_SCALE +auto-reconnect +home-drive +dynamic-resolution $MULTI_FLAG /app:program:"$2" /v:"$RDP_IP" 1>/dev/null 2>&1 & $FREERDP_COMMAND "$RDP_FLAGS" /d:"$RDP_DOMAIN" /u:"$RDP_USER" /p:"$RDP_PASS" /scale:$RDP_SCALE +auto-reconnect +home-drive +dynamic-resolution $MULTI_FLAG /app:program:"$2" /v:"$RDP_IP" 1>/dev/null 2>&1 &
elif [ "${1}" != "install" ]; then elif [ "$1" != "install" ]; then
dprint "DIR:${DIR}" dprint "DIR:${DIR}"
if [ -e "${DIR}/../apps/${1}/info" ]; then if [ -e "${DIR}/../apps/$1/info" ]; then
# shellcheck disable=SC1090 # shellcheck disable=SC1090
. "${DIR}/../apps/${1}/info" . "${DIR}/../apps/$1/info"
ICON="${DIR}/../apps/${1}/icon.svg" ICON="${DIR}/../apps/$1/icon.svg"
elif [ -e "$HOME/.local/share/winapps/apps/${1}/info" ]; then elif [ -e "$HOME/.local/share/winapps/apps/$1/info" ]; then
# shellcheck disable=SC1090 # shellcheck disable=SC1090
. "$HOME/.local/share/winapps/apps/${1}/info" . "$HOME/.local/share/winapps/apps/$1/info"
ICON="$HOME/.local/share/winapps/apps/${1}/icon.svg" ICON="$HOME/.local/share/winapps/apps/$1/icon.svg"
elif [ -e "/usr/local/share/winapps/apps/${1}/info" ]; then elif [ -e "/usr/local/share/winapps/apps/$1/info" ]; then
# shellcheck disable=SC1090 # shellcheck disable=SC1090
. "/usr/local/share/winapps/apps/${1}/info" . "/usr/local/share/winapps/apps/$1/info"
ICON="/usr/local/share/winapps/apps/${1}/icon.svg" ICON="/usr/local/share/winapps/apps/$1/icon.svg"
else else
echo "You need to run 'installer.sh' first." echo "You need to run 'installer.sh' first."
exit 1 exit 1
@ -116,9 +116,10 @@ elif [ "${1}" != "install" ]; then
dprint "HOME:$HOME" dprint "HOME:$HOME"
FILE=$(echo "$2" | sed 's|'"$HOME"'|\\\\tsclient\\home|;s|/|\\|g;s|\\|\\\\|g') FILE=$(echo "$2" | sed 's|'"$HOME"'|\\\\tsclient\\home|;s|/|\\|g;s|\\|\\\\|g')
dprint "FILE:${FILE}" dprint "FILE:${FILE}"
$FREERDP_COMMAND $RDP_FLAGS /d:"$RDP_DOMAIN" /u:"$RDP_USER" /p:"$RDP_PASS" /scale:$RDP_SCALE +auto-reconnect +clipboard +home-drive -wallpaper +dynamic-resolution $MULTI_FLAG /wm-class:"$FULL_NAME" /app:program:"$WIN_EXECUTABLE",icon:"$ICON",name:"$FULL_NAME",cmd:"\"$FILE\"" /v:"$RDP_IP" 1>/dev/null 2>&1 & # shellcheck disable=SC2140
$FREERDP_COMMAND "$RDP_FLAGS" /d:"$RDP_DOMAIN" /u:"$RDP_USER" /p:"$RDP_PASS" /scale:$RDP_SCALE +auto-reconnect +clipboard +home-drive -wallpaper +dynamic-resolution $MULTI_FLAG /wm-class:"$FULL_NAME" /app:program:"$WIN_EXECUTABLE",icon:"$ICON",name:"$FULL_NAME",cmd:"\"$FILE\"" /v:"$RDP_IP" 1>/dev/null 2>&1 &
else else
$FREERDP_COMMAND $RDP_FLAGS /d:"$RDP_DOMAIN" /u:"$RDP_USER" /p:"$RDP_PASS" /scale:$RDP_SCALE +auto-reconnect +clipboard +home-drive -wallpaper +dynamic-resolution $MULTI_FLAG /wm-class:"$FULL_NAME" /app:program:"$WIN_EXECUTABLE",icon:"$ICON",name:"$FULL_NAME" /v:"$RDP_IP" 1>/dev/null 2>&1 & $FREERDP_COMMAND "$RDP_FLAGS" /d:"$RDP_DOMAIN" /u:"$RDP_USER" /p:"$RDP_PASS" /scale:$RDP_SCALE +auto-reconnect +clipboard +home-drive -wallpaper +dynamic-resolution $MULTI_FLAG /wm-class:"$FULL_NAME" /app:program:"$WIN_EXECUTABLE",icon:"$ICON",name:"$FULL_NAME" /v:"$RDP_IP" 1>/dev/null 2>&1 &
fi fi
fi fi

2
install/inquirer.sh
View File

@ -26,6 +26,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
# shellcheck disable=all
# store the current set options # store the current set options
OLD_SET=$- OLD_SET=$-
set -e set -e

94
installer.sh
View File

@ -42,14 +42,18 @@ function waFindInstalled() {
rm -f "$HOME/.local/share/winapps/installed" rm -f "$HOME/.local/share/winapps/installed"
rm -f "$HOME/.local/share/winapps/detected" rm -f "$HOME/.local/share/winapps/detected"
cp "$DIR/install/ExtractPrograms.ps1" "$HOME/.local/share/winapps/ExtractPrograms.ps1" cp "$DIR/install/ExtractPrograms.ps1" "$HOME/.local/share/winapps/ExtractPrograms.ps1"
# FIXME
# shellcheck disable=SC2066
for F in "$DIR/apps"; do for F in "$DIR/apps"; do
[[ -e "$F" ]] || break [[ -e "$F" ]] || break
. "$DIR/apps/${F}/info" # shellcheck disable=SC1090
echo "IF EXIST \"${WIN_EXECUTABLE}\" ECHO ${F} >> \\\\tsclient\\home\\.local\\share\\winapps\\installed.tmp" >>"$HOME/.local/share/winapps/installed.bat" . "$DIR/apps/$F/info"
printf "IF EXIST \"%s\" ECHO %s >> \\\\tsclient\\home\\.local\\share\\winapps\\installed.tmp" "$WIN_EXECUTABLE" "$F" >>"$HOME/.local/share/winapps/installed.bat"
done done
echo "powershell.exe -ExecutionPolicy Bypass -File \\\\tsclient\\home\\.local\\share\\winapps\\ExtractPrograms.ps1 > \\\\tsclient\home\\.local\\share\\winapps\\detected" >>"$HOME/.local/share/winapps/installed.bat" printf "powershell.exe -ExecutionPolicy Bypass -File \\\\tsclient\\home\\.local\\share\\winapps\\ExtractPrograms.ps1 > \\\\tsclient\home\\.local\\share\\winapps\\detected" >>"$HOME/.local/share/winapps/installed.bat"
echo "RENAME \\\\tsclient\\home\\.local\\share\\winapps\\installed.tmp installed" >>"$HOME/.local/share/winapps/installed.bat" printf "RENAME \\\\tsclient\\home\\.local\\share\\winapps\\installed.tmp installed" >>"$HOME/.local/share/winapps/installed.bat"
$FREERDP_COMMAND /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" +auto-reconnect +home-drive -wallpaper +span /app:program:"C:\Windows\System32\cmd.exe",cmd:"/C \\\\tsclient\\home\\.local\\share\\winapps\\installed.bat" /v:${RDP_IP} 1>/dev/null 2>&1 & # shellcheck disable=SC2140
$FREERDP_COMMAND /d:"$RDP_DOMAIN" /u:"$RDP_USER" /p:"$RDP_PASS" +auto-reconnect +home-drive -wallpaper +span /app:program:"C:\Windows\System32\cmd.exe",cmd:"/C \\\\tsclient\\home\\.local\\share\\winapps\\installed.bat" /v:"$RDP_IP" 1>/dev/null 2>&1 &
COUNT=0 COUNT=0
while [ ! -f "$HOME/.local/share/winapps/installed" ]; do while [ ! -f "$HOME/.local/share/winapps/installed" ]; do
sleep 5 sleep 5
@ -71,7 +75,7 @@ function waFindInstalled() {
done done
if [ $MAKEDEMO = 1 ]; then if [ $MAKEDEMO = 1 ]; then
rm -rf /tmp/winapps_demo rm -rf /tmp/winapps_demo
cp -a "$HOME/.local/share/winapps /tmp/winapps_demo" cp -a "$HOME/.local/share/winapps" /tmp/winapps_demo
exit exit
fi fi
else else
@ -83,29 +87,29 @@ function waFindInstalled() {
} }
function waConfigureApp() { function waConfigureApp() {
if [ -z "${ICON}" ]; then if [ -z "$ICON" ]; then
ICON=$SYS_PATH/apps/${1}/icon.${2} ICON=$SYS_PATH/apps/$1/icon.$2
fi fi
# shellcheck disable=SC1090
. "$SYS_PATH/apps/${1}/info" . "$SYS_PATH/apps/$1/info"
echo -n " Configuring $NAME..." echo -n " Configuring $NAME..."
if [ $USEDEMO != 1 ]; then if [ $USEDEMO != 1 ]; then
$SUDO rm -f "$APP_PATH/${1}.desktop" $SUDO rm -f "$APP_PATH/$1.desktop"
echo "[Desktop Entry] echo "[Desktop Entry]
Name=$NAME Name=$NAME
Exec=$BIN_PATH/winapps ${1} %F Exec=$BIN_PATH/winapps $1 %F
Terminal=false Terminal=false
Type=Application Type=Application
Icon=$ICON Icon=$ICON
StartupWMClass=${FULL_NAME} StartupWMClass=$FULL_NAME
Comment=${FULL_NAME} Comment=$FULL_NAME
Categories=${CATEGORIES} Categories=$CATEGORIES
MimeType=${MIME_TYPES} MimeType=$MIME_TYPES
" | $SUDO tee "$APP_PATH/${1}.desktop" >/dev/null " | $SUDO tee "$APP_PATH/$1.desktop" >/dev/null
$SUDO rm -f "$BIN_PATH/${1}" $SUDO rm -f "$BIN_PATH/$1"
echo "#!/usr/bin/env bash $BIN_PATH/winapps ${1} $* echo "#!/usr/bin/env bash $BIN_PATH/winapps $1 $*
" | $SUDO tee "$BIN_PATH/${1}" >/dev/null " | $SUDO tee "$BIN_PATH/$1" >/dev/null
$SUDO chmod a+x "$BIN_PATH/${1}" $SUDO chmod a+x "$BIN_PATH/$1"
fi fi
echo " Finished." echo " Finished."
@ -114,21 +118,24 @@ MimeType=${MIME_TYPES}
function waConfigureApps() { function waConfigureApps() {
APPS=() APPS=()
for F in $(cat "$HOME/.local/share/winapps/installed" | sed 's/\r/\n/g'); do while IFS= read -r F; do
. "$DIR/apps/${F}/info" # shellcheck disable=SC1090
APPS+=("${FULL_NAME} (${F})") . "$DIR/apps/$F/info"
APPS+=("$FULL_NAME ($F)")
INSTALLED_EXES+=("$(echo "${WIN_EXECUTABLE##*\\}" | tr '[:upper:]' '[:lower:]')") INSTALLED_EXES+=("$(echo "${WIN_EXECUTABLE##*\\}" | tr '[:upper:]' '[:lower:]')")
done done < <(sed 's/\r/\n/g' < "$HOME/.local/share/winapps/installed")
# FIXME
# shellcheck disable=SC2207,SC2031
IFS=$'\n' APPS=($(sort <<<"${APPS[*]}")) IFS=$'\n' APPS=($(sort <<<"${APPS[*]}"))
unset IFS unset IFS
OPTIONS=("Set up all detected pre-configured applications" "Select which pre-configured applications to set up" "Do not set up any pre-configured applications") OPTIONS=("Set up all detected pre-configured applications" "Select which pre-configured applications to set up" "Do not set up any pre-configured applications")
if [ "${INSTALL_TYPE}" != 'User' ]; then if [ "$INSTALL_TYPE" != 'User' ]; then
menuFromArr APP_INSTALL "How would you like to handle WinApps pre-configured applications?" "${OPTIONS[@]}" menuFromArr APP_INSTALL "How would you like to handle WinApps pre-configured applications?" "${OPTIONS[@]}"
else "grep -l -d skip" else "grep -l -d skip"
menuFromArr APP_INSTALL "How would you like to handle WinApps pre-configured applications? If any web browser is set-up, may be configured as default browser." "${OPTIONS[@]}" menuFromArr APP_INSTALL "How would you like to handle WinApps pre-configured applications? If any web browser is set-up, may be configured as default browser." "${OPTIONS[@]}"
fi fi
if [ "${APP_INSTALL}" = "Select which pre-configured applications to set up" ]; then if [ "$APP_INSTALL" = "Select which pre-configured applications to set up" ]; then
checkbox_input "Which pre-configured apps would you like to set up?" APPS SELECTED_APPS checkbox_input "Which pre-configured apps would you like to set up?" APPS SELECTED_APPS
echo "" >"$HOME/.local/share/winapps/installed" echo "" >"$HOME/.local/share/winapps/installed"
for F in "${SELECTED_APPS[@]}"; do for F in "${SELECTED_APPS[@]}"; do
@ -139,16 +146,16 @@ function waConfigureApps() {
fi fi
$SUDO cp "$DIR/bin/winapps" "$BIN_PATH/winapps" $SUDO cp "$DIR/bin/winapps" "$BIN_PATH/winapps"
COUNT=0 COUNT=0
if [ "${APP_INSTALL}" != "Do not set up any pre-configured applications" ]; then if [ "$APP_INSTALL" != "Do not set up any pre-configured applications" ]; then
for F in $(cat "$HOME/.local/share/winapps/installed" | sed 's/\r/\n/g'); do while IFS= read -r F; do
COUNT=$((COUNT + 1)) COUNT=$((COUNT + 1))
$SUDO cp -r "apps/${F}" "$SYS_PATH/apps" $SUDO cp -r "apps/$F" "$SYS_PATH/apps"
waConfigureApp "${F}" svg waConfigureApp "$F" svg
done done < <(sed 's/\r/\n/g' < "$HOME/.local/share/winapps/installed")
fi fi
rm -f "$HOME/.local/share/winapps/installed" rm -f "$HOME/.local/share/winapps/installed"
rm -f "$HOME/.local/share/winapps/installed.bat" rm -f "$HOME/.local/share/winapps/installed.bat"
if (($COUNT == 0)); then if ((COUNT == 0)); then
echo " No configured applications." echo " No configured applications."
fi fi
} }
@ -156,14 +163,14 @@ function waConfigureApps() {
function waConfigureAppsAllOfficiallySupported(){ function waConfigureAppsAllOfficiallySupported(){
$SUDO cp "$DIR/bin/winapps" "$BIN_PATH/winapps" $SUDO cp "$DIR/bin/winapps" "$BIN_PATH/winapps"
COUNT=0 COUNT=0
for F in $(cat "$HOME/.local/share/winapps/installed" | sed 's/\r/\n/g'); do while IFS= read -r F; do
COUNT=$((COUNT + 1)) COUNT=$((COUNT + 1))
$SUDO cp -r "apps/${F}" "$SYS_PATH/apps" $SUDO cp -r "apps/$F" "$SYS_PATH/apps"
waConfigureApp "${F}" svg waConfigureApp "$F" svg
done done < <(sed 's/\r/\n/g' < "$HOME/.local/share/winapps/installed")
rm -f "$HOME/.local/share/winapps/installed" rm -f "$HOME/.local/share/winapps/installed"
rm -f "$HOME/.local/share/winapps/installed.bat" rm -f "$HOME/.local/share/winapps/installed.bat"
if (($COUNT == 0)); then if ((COUNT == 0)); then
echo " No configured applications." echo " No configured applications."
fi fi
} }
@ -171,15 +178,17 @@ function waConfigureAppsAllOfficiallySupported(){
function waConfigureDetectedApps() { function waConfigureDetectedApps() {
if [ -f "$HOME/.local/share/winapps/detected" ]; then if [ -f "$HOME/.local/share/winapps/detected" ]; then
sed -i 's/\r//g' "$HOME/.local/share/winapps/detected" sed -i 's/\r//g' "$HOME/.local/share/winapps/detected"
# shellcheck disable=SC1091
. "$HOME/.local/share/winapps/detected" . "$HOME/.local/share/winapps/detected"
APPS=() APPS=()
# shellcheck disable=SC2153
for I in "${!NAMES[@]}"; do for I in "${!NAMES[@]}"; do
EXE=${EXES[$I]##*\\} EXE=${EXES[$I]##*\\}
EXE_LOWER=$(echo "$EXE" | tr '[:upper:]' '[:lower:]') EXE_LOWER=$(echo "$EXE" | tr '[:upper:]' '[:lower:]')
if ( if (
dlm=$'\x1F' dlm=$'\x1F'
IFS="$dlm" IFS="$dlm"
[[ "$dlm${INSTALLED_EXES[*]}$dlm" != *"$dlm${EXE_LOWER}$dlm"* ]] [[ "$dlm${INSTALLED_EXES[*]}$dlm" != *"$dlm$EXE_LOWER$dlm"* ]]
); then ); then
APPS+=("${NAMES[$I]} ($EXE)") APPS+=("${NAMES[$I]} ($EXE)")
fi fi
@ -188,7 +197,7 @@ function waConfigureDetectedApps() {
unset IFS unset IFS
OPTIONS=("Set up all detected applications" "Select which applications to set up" "Do not set up any applications") OPTIONS=("Set up all detected applications" "Select which applications to set up" "Do not set up any applications")
menuFromArr APP_INSTALL "How would you like to handle other detected applications?" "${OPTIONS[@]}" menuFromArr APP_INSTALL "How would you like to handle other detected applications?" "${OPTIONS[@]}"
if [ "${APP_INSTALL}" = "Select which applications to set up" ]; then if [ "$APP_INSTALL" = "Select which applications to set up" ]; then
checkbox_input "Which other apps would you like to set up?" APPS SELECTED_APPS checkbox_input "Which other apps would you like to set up?" APPS SELECTED_APPS
echo "" >"$HOME/.local/share/winapps/installed" echo "" >"$HOME/.local/share/winapps/installed"
for F in "${SELECTED_APPS[@]}"; do for F in "${SELECTED_APPS[@]}"; do
@ -197,7 +206,7 @@ function waConfigureDetectedApps() {
APP="${F% (*}" APP="${F% (*}"
echo "$EXE|${APP}" >>"$HOME/.local/share/winapps/installed" echo "$EXE|${APP}" >>"$HOME/.local/share/winapps/installed"
done done
elif [ "${APP_INSTALL}" = "Set up all detected applications" ]; then elif [ "$APP_INSTALL" = "Set up all detected applications" ]; then
for I in "${!EXES[@]}"; do for I in "${!EXES[@]}"; do
EXE=${EXES[$I]##*\\} EXE=${EXES[$I]##*\\}
echo "$EXE|${NAMES[$I]}" >>"$HOME/.local/share/winapps/installed" echo "$EXE|${NAMES[$I]}" >>"$HOME/.local/share/winapps/installed"
@ -227,6 +236,7 @@ CATEGORIES=\"WinApps\"
# GNOME mimetypes # GNOME mimetypes
MIME_TYPES=\"\" MIME_TYPES=\"\"
" | sudo tee "$SYS_PATH/apps/$EXE/info" >/dev/null " | sudo tee "$SYS_PATH/apps/$EXE/info" >/dev/null
# shellcheck disable=SC2153
echo "${ICONS[$I]}" | base64 -d | sudo tee "$SYS_PATH/apps/$EXE/icon.ico" >/dev/null echo "${ICONS[$I]}" | base64 -d | sudo tee "$SYS_PATH/apps/$EXE/icon.ico" >/dev/null
waConfigureApp "$EXE" ico waConfigureApp "$EXE" ico
COUNT=$((COUNT + 1)) COUNT=$((COUNT + 1))
@ -306,7 +316,7 @@ function waUninstallSystem() {
done done
} }
if [ -z "${1}" ]; then if [ -z "$1" ]; then
OPTIONS=(User System) OPTIONS=(User System)
menuFromArr INSTALL_TYPE "Would you like to install for the current user or the whole system?" "${OPTIONS[@]}" menuFromArr INSTALL_TYPE "Would you like to install for the current user or the whole system?" "${OPTIONS[@]}"
elif [ "$1" = '--user' ]; then elif [ "$1" = '--user' ]; then