🔧 various fixes
- add `download_gui` to the `common` script - unify indentation - prefer `notify-send` over `zenity` for better notifications
This commit is contained in:
parent
13f1bec42b
commit
bc40c2e4d5
3 changed files with 177 additions and 181 deletions
|
|
@ -16,3 +16,55 @@ needs_commands() { # $status $cmd1 $cmd2 ...
|
|||
fi
|
||||
done
|
||||
}
|
||||
|
||||
download_gui() { # $uri $file $sha256
|
||||
needs_commands "curl" "zenity" "sha256sum" || return 1
|
||||
echo "Downloading '${1}' to '${2}'"
|
||||
|
||||
curl --show-error --fail --location \
|
||||
--output "${2}" \
|
||||
"${1}" &
|
||||
_dg_curlpid=$!
|
||||
|
||||
yes | zenity \
|
||||
--progress --pulsate --auto-close \
|
||||
--title="Downloading" \
|
||||
--text="Downloading '${2}' ..." &
|
||||
_dg_zenpid=$!
|
||||
|
||||
while kill -0 "${_dg_curlpid}" 2>/dev/null; do
|
||||
if ! kill -0 "${_dg_zenpid}" 2>/dev/null; then
|
||||
# progress bar died; ask for abort
|
||||
if zenity \
|
||||
--question \
|
||||
--text="Abort Download?"; then
|
||||
kill "${_dg_curlpid}" 2>/dev/null || true
|
||||
echo "Download cancelled!" >&2
|
||||
break
|
||||
fi
|
||||
|
||||
# restart progress bar
|
||||
yes | zenity \
|
||||
--progress --pulsate --auto-close \
|
||||
--title="Downloading" \
|
||||
--text="Downloading '${2}' ..." &
|
||||
_dg_zenpid=$!
|
||||
fi
|
||||
|
||||
sleep 0.2
|
||||
done
|
||||
|
||||
kill "${_dg_zenpid}" 2>/dev/null || true
|
||||
wait "${_dg_curlpid}"
|
||||
|
||||
if [ -z "${3}" ]; then
|
||||
echo "No SHA256 (OK)!" >&2
|
||||
return 0
|
||||
elif [ "$( sha256sum "${2}" | cut -d' ' -f1 )" = "${3}" ]; then
|
||||
echo "SHA256 ${3} OK!" >&2
|
||||
return 0
|
||||
else
|
||||
echo "SHA256 ${3} mismatch!" >&2
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,27 +4,16 @@
|
|||
# summary: Startup script: Downloads and installs "Citrix Workspace"
|
||||
# params: none
|
||||
|
||||
THISDIR="$(dirname "$(readlink -f "${0}")")"
|
||||
# shellcheck disable=SC1091
|
||||
. "${THISDIR}/.inc/common"
|
||||
|
||||
########
|
||||
# INIT #
|
||||
########
|
||||
# find all download links on update page
|
||||
# find corresponding checksums
|
||||
|
||||
has_command() { # $command
|
||||
command -v "$1" &>/dev/null
|
||||
}
|
||||
|
||||
needs_commands() { # $cmd1 $cmd2 ...
|
||||
local cmd
|
||||
for cmd in "${@}"; do
|
||||
if ! has_command "${cmd}"; then
|
||||
echo "Command '${cmd}' not available!" >&2
|
||||
return 1
|
||||
fi
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
needs_commands "xidel" "curl" || exit 1
|
||||
|
||||
echo -n "Downloading citrix update page ... " >&2
|
||||
|
|
@ -78,7 +67,7 @@ unset links csums
|
|||
# FUNCS #
|
||||
#########
|
||||
|
||||
find_link() { # $filename_regex
|
||||
find_links() { # $filename_regex
|
||||
local link_regex="://downloads\.citrix\.com/[[:digit:]]+/${1}\?__gda__=exp=[[:digit:]]+~acl=[^~]+~hmac=[[:digit:]a-f]{64}$"
|
||||
|
||||
for key in "${!citrix_data[@]}"; do
|
||||
|
|
@ -88,48 +77,48 @@ find_link() { # $filename_regex
|
|||
done
|
||||
}
|
||||
|
||||
find_link_deb() { # $name $arch
|
||||
find_links_deb() { # $name $arch
|
||||
case "${2}" in
|
||||
x86_64) local arch="amd64" ;;
|
||||
arm64) local arch="arm64" ;;
|
||||
*) local arch="${2}" ;;
|
||||
esac
|
||||
|
||||
find_link "${1}_[[:digit:]\.]+_${arch}\.deb"
|
||||
find_links "${1}_[[:digit:]\.]+_${arch}\.deb"
|
||||
}
|
||||
|
||||
find_link_rpm() { # $name $flavor $arch
|
||||
find_link "${1}(:?-${2})?-[[:digit:]\.]+(:?-[[:digit:]]+)?.${3}\.rpm"
|
||||
find_links_rpm() { # $name $flavor $arch
|
||||
find_links "${1}(:?-${2})?-[[:digit:]\.]+(:?-[[:digit:]]+)?.${3}\.rpm"
|
||||
}
|
||||
|
||||
find_link_targz() { # $arch
|
||||
find_links_targz() { # $arch
|
||||
case "${1}" in
|
||||
x86_64) local arch="x64" ;;
|
||||
arm64) local arch="arm64" ;;
|
||||
*) local arch="${1}" ;;
|
||||
esac
|
||||
|
||||
find_link "linux${arch}-[[:digit:]\.]+\.tar.gz"
|
||||
find_links "linux${arch}-[[:digit:]\.]+\.tar.gz"
|
||||
}
|
||||
|
||||
# shellcheck disable=SC2155
|
||||
list_all() {
|
||||
local debs="$(find_link_deb "[[:lower:]]+" "[[:alnum:]]+")"
|
||||
list_all_links() {
|
||||
local debs="$(find_links_deb "[[:lower:]]+" "[[:alnum:]]+")"
|
||||
local debc="$(echo "${debs}" | wc -l)"
|
||||
echo "deb:"
|
||||
echo "${debs}"
|
||||
|
||||
local rpms="$(find_link_rpm "[[:alpha:]]+" "[[:lower:]]+" "[[:alnum:]_]+")"
|
||||
local rpms="$(find_links_rpm "[[:alpha:]]+" "[[:lower:]]+" "[[:alnum:]_]+")"
|
||||
local rpmc="$(echo "${rpms}" | wc -l)"
|
||||
echo "rpm:"
|
||||
echo "${rpms}"
|
||||
|
||||
local tars="$(find_link_targz "[[:alnum:]]+")"
|
||||
local tars="$(find_links_targz "[[:alnum:]]+")"
|
||||
local tarc="$(echo "${tars}" | wc -l)"
|
||||
echo "tar.gz:"
|
||||
echo "${tars}"
|
||||
|
||||
local anys="$(find_link "[[:alnum:]\._-]+")"
|
||||
local anys="$(find_links "[[:alnum:]\._-]+")"
|
||||
local anyc="$(echo "${anys}" | wc -l)"
|
||||
echo "any:"
|
||||
echo "${anys}"
|
||||
|
|
@ -140,62 +129,15 @@ list_all() {
|
|||
fi
|
||||
}
|
||||
|
||||
download_gui() { # $link $csum $destfile
|
||||
needs_commands "curl" "zenity" "sha256sum" || return 1
|
||||
echo "Downloading '${1}' to '${3}'"
|
||||
|
||||
curl -fL -o "${3}" "${1}" &
|
||||
local curlpid=$!
|
||||
|
||||
yes | zenity \
|
||||
--progress --pulsate --auto-close \
|
||||
--title="Downloading" \
|
||||
--text="Downloading '${3}' ..." &
|
||||
local zenpid=$!
|
||||
|
||||
while kill -0 "${curlpid}" 2>/dev/null; do
|
||||
if ! kill -0 "${zenpid}" 2>/dev/null; then
|
||||
# progress bar died; ask for abort
|
||||
if zenity \
|
||||
--question \
|
||||
--text="Abort Download?"; then
|
||||
kill "${curlpid}" 2>/dev/null || true
|
||||
echo "Download cancelled!" >&2
|
||||
break
|
||||
fi
|
||||
|
||||
# restart progress bar
|
||||
yes | zenity \
|
||||
--progress --pulsate --auto-close \
|
||||
--title="Downloading" \
|
||||
--text="Downloading '${3}' ..." &
|
||||
zenpid=$!
|
||||
fi
|
||||
|
||||
sleep 0.2
|
||||
done
|
||||
|
||||
kill "${zenpid}" 2>/dev/null || true
|
||||
wait "${curlpid}"
|
||||
|
||||
if [ "$( sha256sum "${3}" | cut -d' ' -f1 )" = "${2}" ]; then
|
||||
echo "SHA256 ${2} OK!" >&2
|
||||
return 0
|
||||
else
|
||||
echo "SHA256 ${2} mismatch!" >&2
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
install_deb() { # $name
|
||||
needs_commands "dpkg-query" "zenity" "gdebi-gtk" || return 1
|
||||
needs_commands "dpkg-query" "zenity" "notify-send" "gdebi-gtk" || return 1
|
||||
|
||||
local arch
|
||||
arch="$(uname -m)"
|
||||
echo "Trying to install ${1} DEB for ${arch}" >&2
|
||||
|
||||
local link
|
||||
if ! link="$(find_link_deb "${1}" "${arch}")"; then
|
||||
if ! link="$(find_links_deb "${1}" "${arch}")"; then
|
||||
echo "No DEB found!" >&2
|
||||
return 1
|
||||
elif [ "$(echo "${link}" | wc -l)" -ne 1 ]; then
|
||||
|
|
@ -214,10 +156,11 @@ install_deb() { # $name
|
|||
if version_installed="$(dpkg-query --show --showformat='${Version}\n' "${1}")" \
|
||||
&& [ "${version_available}" = "${version_installed}" ]; then
|
||||
echo "Newest version already installed!" >&2
|
||||
zenity \
|
||||
--notification \
|
||||
--window-icon="info" \
|
||||
--text="Citrix \"${1}\": Newest version is installed!"
|
||||
notify-send \
|
||||
--app-name "citrix-update" \
|
||||
--icon "info" \
|
||||
"Citrix Update" \
|
||||
"Citrix \"${1}\": Newest version is installed!"
|
||||
sleep 2
|
||||
|
||||
return 0
|
||||
|
|
@ -234,7 +177,7 @@ install_deb() { # $name
|
|||
local destfile
|
||||
destfile="$(mktemp --tmpdir "XXXXX_${1}_${version_available}.deb")"
|
||||
|
||||
if download_gui "${link}" "${csum}" "${destfile}"; then
|
||||
if download_gui "${link}" "${destfile}" "${csum}"; then
|
||||
echo "Download for ${1} successful!" >&2
|
||||
gdebi-gtk "${destfile}"
|
||||
fi
|
||||
|
|
@ -248,7 +191,7 @@ install_deb() { # $name
|
|||
# MAIN #
|
||||
########
|
||||
|
||||
list_all > /dev/null
|
||||
list_all_links > /dev/null
|
||||
|
||||
if has_command "apt"; then
|
||||
install_deb "icaclient" || exit 1
|
||||
|
|
|
|||
|
|
@ -33,17 +33,18 @@ version_installed="$( \
|
|||
if [ "${version_available}" != "${version_installed}" ]; then
|
||||
echo "new nextcloud version available: ${version_available}" >&2
|
||||
notify-send \
|
||||
--app-name "Nextcloud" \
|
||||
--app-name "nextcloud-appimage-launch" \
|
||||
--icon "${THISDIR}/.icon/nextcloud.svg" \
|
||||
"nextcloud-appimage-launch" \
|
||||
"new nextcloud version available: ${version_available}"
|
||||
"Nextcloud" \
|
||||
"Installing new Nextcloud version: ${version_available}"
|
||||
|
||||
curl --silent --show-error --fail --location \
|
||||
if download_gui \
|
||||
"https://github.com/nextcloud-releases/desktop/releases/download/v${version_available}/Nextcloud-${version_available}-x86_64.AppImage" \
|
||||
--output "${INSTALL_DIR}/Nextcloud-${version_available}-x86_64.AppImage"
|
||||
|
||||
"${INSTALL_DIR}/Nextcloud-${version_available}-x86_64.AppImage" \
|
||||
""; then # no sha256
|
||||
chmod +x "${INSTALL_DIR}/Nextcloud-${version_available}-x86_64.AppImage"
|
||||
ln -sf "./Nextcloud-${version_available}-x86_64.AppImage" "${INSTALL_DIR}/current"
|
||||
fi
|
||||
fi
|
||||
|
||||
exec "${INSTALL_DIR}/current" --background "${@}"
|
||||
|
|
|
|||
Loading…
Reference in a new issue