mirror of
https://github.com/winapps-org/winapps.git
synced 2025-06-04 06:07:19 +02:00
Add user vs system mode
This commit is contained in:
Fmstrat
Oskar Manhart
parent
184fb1167f
commit
0ac0a448af
164
install.sh
164
install.sh
@ -1,49 +1,57 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
sudo ls > /dev/null
|
||||
|
||||
echo "Installing..."
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
. "${DIR}/bin/winapps" install
|
||||
|
||||
# Check for installed apps
|
||||
echo -n " Checking for installed apps in RDP machine..."
|
||||
rm -f ${HOME}/.local/share/winapps/installed.bat
|
||||
rm -f ${HOME}/.local/share/winapps/installed
|
||||
for F in $(ls "${DIR}/apps"); do
|
||||
. "${DIR}/apps/${F}/info"
|
||||
echo "IF EXIST \"${WIN_EXECUTABLE}\" ECHO ${F} >> \\\\tsclient\\home\\.local\\share\\winapps\\installed" >> ${HOME}/.local/share/winapps/installed.bat
|
||||
done;
|
||||
echo "ECHO DONE >> \\\\tsclient\\home\\.local\\share\\winapps\\installed" >> ${HOME}/.local/share/winapps/installed.bat
|
||||
touch ${HOME}/.local/share/winapps/installed
|
||||
LAST_RAN=$(stat -t -c %Y ${HOME}/.local/share/winapps/installed)
|
||||
sleep 6
|
||||
xfreerdp /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} +auto-reconnect +home-drive -wallpaper /span /wm-class:"RDPInstaller" /app:"C:\Windows\System32\cmd.exe" /app-icon:"${DIR}/../icons/windows.svg" /app-cmd:"/C \\\\tsclient\\home\\.local\\share\\winapps\\installed.bat" 1> /dev/null 2>&1 &
|
||||
sleep 6
|
||||
COUNT=0
|
||||
THIS_RUN=$(stat -t -c %Y ${HOME}/.local/share/winapps/installed)
|
||||
while (( $THIS_RUN - $LAST_RAN < 5 )); do
|
||||
sleep 5
|
||||
THIS_RUN=$(stat -t -c %Y ${HOME}/.local/share/winapps/installed)
|
||||
COUNT=$((COUNT + 1))
|
||||
if (( COUNT == 5 )); then
|
||||
echo " Finished."
|
||||
echo "The RDP connection failed to connect or run."
|
||||
exit
|
||||
fi
|
||||
done
|
||||
echo " Finished."
|
||||
|
||||
# Install apps
|
||||
COUNT=0
|
||||
for F in $(cat "${HOME}/.local/share/winapps/installed" |sed 's/\r/\n/g'); do
|
||||
if [ "${F}" != "DONE" ]; then
|
||||
COUNT=$((COUNT + 1))
|
||||
function waUsage() {
|
||||
echo 'Usage:
|
||||
./install.sh --user # Install everything in ${HOME}
|
||||
./install.sh --system # Install everything in /usr'
|
||||
exit
|
||||
}
|
||||
|
||||
function waInstall() {
|
||||
. "${DIR}/bin/winapps" install
|
||||
}
|
||||
|
||||
function waFindInstalled() {
|
||||
echo -n " Checking for installed apps in RDP machine..."
|
||||
rm -f ${HOME}/.local/share/winapps/installed.bat
|
||||
rm -f ${HOME}/.local/share/winapps/installed
|
||||
for F in $(ls "${DIR}/apps"); do
|
||||
. "${DIR}/apps/${F}/info"
|
||||
echo -n " Configuring ${NAME}..."
|
||||
sudo rm -f "/usr/share/applications/${F}.desktop"
|
||||
echo "[Desktop Entry]
|
||||
echo "IF EXIST \"${WIN_EXECUTABLE}\" ECHO ${F} >> \\\\tsclient\\home\\.local\\share\\winapps\\installed" >> ${HOME}/.local/share/winapps/installed.bat
|
||||
done;
|
||||
echo "ECHO DONE >> \\\\tsclient\\home\\.local\\share\\winapps\\installed" >> ${HOME}/.local/share/winapps/installed.bat
|
||||
touch ${HOME}/.local/share/winapps/installed
|
||||
LAST_RAN=$(stat -t -c %Y ${HOME}/.local/share/winapps/installed)
|
||||
sleep 6
|
||||
xfreerdp /d:"${RDP_DOMAIN}" /u:"${RDP_USER}" /p:"${RDP_PASS}" /v:${RDP_IP} +auto-reconnect +home-drive -wallpaper /span /wm-class:"RDPInstaller" /app:"C:\Windows\System32\cmd.exe" /app-icon:"${DIR}/../icons/windows.svg" /app-cmd:"/C \\\\tsclient\\home\\.local\\share\\winapps\\installed.bat" 1> /dev/null 2>&1 &
|
||||
sleep 6
|
||||
COUNT=0
|
||||
THIS_RUN=$(stat -t -c %Y ${HOME}/.local/share/winapps/installed)
|
||||
while (( $THIS_RUN - $LAST_RAN < 5 )); do
|
||||
sleep 5
|
||||
THIS_RUN=$(stat -t -c %Y ${HOME}/.local/share/winapps/installed)
|
||||
COUNT=$((COUNT + 1))
|
||||
if (( COUNT == 5 )); then
|
||||
echo " Finished."
|
||||
echo "The RDP connection failed to connect or run."
|
||||
exit
|
||||
fi
|
||||
done
|
||||
echo " Finished."
|
||||
}
|
||||
|
||||
function waConfigureApps() {
|
||||
COUNT=0
|
||||
for F in $(cat "${HOME}/.local/share/winapps/installed" |sed 's/\r/\n/g'); do
|
||||
if [ "${F}" != "DONE" ]; then
|
||||
COUNT=$((COUNT + 1))
|
||||
. "${DIR}/apps/${F}/info"
|
||||
echo -n " Configuring ${NAME}..."
|
||||
${SUDO} rm -f "${APP_PATH}/${F}.desktop"
|
||||
echo "[Desktop Entry]
|
||||
Name=${NAME}
|
||||
Exec=${DIR}/bin/winapps ${F} %F
|
||||
Terminal=false
|
||||
@ -53,26 +61,26 @@ StartupWMClass=${FULL_NAME}
|
||||
Comment=${FULL_NAME}
|
||||
Categories=${CATEGORIES}
|
||||
MimeType=${MIME_TYPES}
|
||||
" |sudo tee "/usr/share/applications/${F}.desktop" > /dev/null
|
||||
sudo rm -f "/usr/local/bin/${F}"
|
||||
echo "#!/usr/bin/env bash
|
||||
" |${SUDO} tee "${APP_PATH}/${F}.desktop" > /dev/null
|
||||
${SUDO} rm -f "${BIN_PATH}/${F}"
|
||||
echo "#!/usr/bin/env bash
|
||||
${DIR}/bin/winapps ${F} $@
|
||||
" |sudo tee "/usr/local/bin/${F}" > /dev/null
|
||||
sudo chmod a+x "/usr/local/bin/${F}"
|
||||
echo " Finished."
|
||||
" |${SUDO} tee "/usr/local/bin/${F}" > /dev/null
|
||||
${SUDO} chmod a+x "${BIN_PATH}/${F}"
|
||||
echo " Finished."
|
||||
fi
|
||||
done
|
||||
rm -f "${HOME}/.local/share/winapps/installed"
|
||||
rm -f "${HOME}/.local/share/winapps/installed.bat"
|
||||
if (( $COUNT == 0 )); then
|
||||
echo " No configured applications were found."
|
||||
fi
|
||||
done
|
||||
rm -f "${HOME}/.local/share/winapps/installed"
|
||||
rm -f "${HOME}/.local/share/winapps/installed.bat"
|
||||
if (( $COUNT == 0 )); then
|
||||
echo " No configured applications were found."
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# Install windows
|
||||
echo -n " Configuring Windows..."
|
||||
sudo rm -f "/usr/share/applications/windows.desktop"
|
||||
echo "[Desktop Entry]
|
||||
function waConfigureWindows() {
|
||||
echo -n " Configuring Windows..."
|
||||
${SUDO} rm -f "${APP_PATH}/windows.desktop"
|
||||
echo "[Desktop Entry]
|
||||
Name=Windows
|
||||
Exec=${DIR}/bin/winapps windows %F
|
||||
Terminal=false
|
||||
@ -81,12 +89,42 @@ Icon=${DIR}/icons/windows.svg
|
||||
StartupWMClass=Micorosoft Windows
|
||||
Comment=Micorosoft Windows
|
||||
Categories=Windows
|
||||
" |sudo tee "/usr/share/applications/windows.desktop" > /dev/null
|
||||
sudo rm -f "/usr/local/bin/windows"
|
||||
echo "#!/usr/bin/env bash
|
||||
" |${SUDO} tee "${APP_PATH}/windows.desktop" > /dev/null
|
||||
${SUDO} rm -f "${BIN_PATH}/windows"
|
||||
echo "#!/usr/bin/env bash
|
||||
${DIR}/bin/winapps windows
|
||||
" |sudo tee "/usr/local/bin/windows" > /dev/null
|
||||
sudo chmod a+x "/usr/local/bin/windows"
|
||||
echo " Finished."
|
||||
" |${SUDO} tee "/${BIN_PATH}/windows" > /dev/null
|
||||
${SUDO} chmod a+x "${BIN_PATH}/windows"
|
||||
echo " Finished."
|
||||
}
|
||||
|
||||
if [ -z "${1}" ]; then
|
||||
waUsage
|
||||
elif [ "${1}" = '--user' ]; then
|
||||
SUDO=""
|
||||
BIN_PATH="${HOME}/.local/bin"
|
||||
APP_PATH="${HOME}/.local/share/applications"
|
||||
elif [ "${1}" = '--system' ]; then
|
||||
SUDO="sudo"
|
||||
sudo ls > /dev/null
|
||||
BIN_PATH="/usr/local/bin"
|
||||
APP_PATH="/usr/share/applications"
|
||||
else
|
||||
waUsage
|
||||
fi
|
||||
|
||||
echo "Installing..."
|
||||
|
||||
# Inititialize
|
||||
waInstall
|
||||
|
||||
# Check for installed apps
|
||||
waFindInstalled
|
||||
|
||||
# Configure apps
|
||||
waConfigureApps
|
||||
|
||||
# Install windows
|
||||
waConfigureWindows
|
||||
|
||||
echo "Installation complete."
|
||||
Loading…
x
Reference in New Issue
Block a user