Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from wimpysworld:main #11

Merged
merged 8 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion 01-main/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ codium
com.github.tkashkin.gamehub
copyq
cosign
croc
# croc
cronopete
crossover
crow-translate
Expand Down Expand Up @@ -158,6 +158,7 @@ minigalaxy
minikube
motrix
mpdevil
mqttx
ms-365-electron
mullvad-vpn
multimc
Expand Down Expand Up @@ -282,6 +283,7 @@ urserver
usbimager
vagrant
veracrypt
veracrypt-console
virtualbox-6.1
virtualbox-7.0
vivaldi-stable
Expand Down
10 changes: 10 additions & 0 deletions 01-main/packages/mqttx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
DEFVER=1
ARCHS_SUPPORTED="amd64 arm64"
get_github_releases "emqx/MQTTX" "latest"
if [ "${ACTION}" != "prettylist" ]; then
URL=$(grep "browser_download_url.*${HOST_ARCH}\.deb\"" "${CACHE_FILE}" | head -n1 | cut -d'"' -f4)
VERSION_PUBLISHED="$(echo "${URL}" | cut -d'/' -f8 | tr -d v)"
fi
PRETTY_NAME="MQTTX"
WEBSITE="https://github.com/emqx/MQTTX/"
SUMMARY="A Powerful and All-in-One MQTT 5.0 client toolbox for Desktop, CLI and WebSocket."
9 changes: 7 additions & 2 deletions 01-main/packages/quickgui
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
DEFVER=1
PPA="ppa:yannick-mauray/quickgui"
DEFVER=3
get_github_releases "quickemu-project/quickgui" "latest"
if [ "${ACTION}" != "prettylist" ]; then
URL=$(grep "browser_download_url.*\-linux.deb\"" "${CACHE_FILE}" | head -n1 | cut -d'"' -f4)
VERSION_PUBLISHED="$(echo "${URL}" | cut -d'/' -f8)"
fi

PRETTY_NAME="Quickgui"
WEBSITE="https://github.com/quickemu-project/quickgui"
SUMMARY="A Flutter frontend for Quickemu."
13 changes: 11 additions & 2 deletions 01-main/packages/veracrypt
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
DEFVER=1
PPA="ppa:unit193/encryption"
DEFVER=2
ARCHS_SUPPORTED="amd64 arm64"
CODENAMES_SUPPORTED="buster bullseye focal jammy"
if [ "${ARCH}" == "amd64" ]; then
CODENAMES_SUPPORTED="${CODENAMES_SUPPORTED} noble bookworm"
fi
get_website "https://www.veracrypt.fr/en/Downloads.html"
if [ "${ACTION}" != "prettylist" ]; then
VERSION_PUBLISHED="$(grep 'Latest Stable Release' $CACHE_FILE |cut -d\ -f 5)"
URL=$(unroll_url "https://launchpad.net/veracrypt/trunk/${VERSION_PUBLISHED}/+download/veracrypt-${VERSION_PUBLISHED}-${UPSTREAM_ID^}-${UPSTREAM_RELEASE}-${HOST_ARCH}.deb\"")
fi
PRETTY_NAME="Veracrypt"
WEBSITE="https://www.veracrypt.fr/en/Downloads.html"
SUMMARY="VeraCrypt is a free and open-source utility for on-the-fly encryption (OTFE)."
14 changes: 14 additions & 0 deletions 01-main/packages/veracrypt-console
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
DEFVER=1
ARCHS_SUPPORTED="amd64 arm64"
CODENAMES_SUPPORTED="buster bullseye focal jammy"
if [ "${ARCH}" == "amd64" ]; then
CODENAMES_SUPPORTED="${CODENAMES_SUPPORTED} noble bookworm"
fi
get_website "https://www.veracrypt.fr/en/Downloads.html"
if [ "${ACTION}" != "prettylist" ]; then
VERSION_PUBLISHED="$(grep 'Latest Stable Release' $CACHE_FILE |cut -d\ -f 5)"
URL=$(unroll_url "https://launchpad.net/veracrypt/trunk/${VERSION_PUBLISHED}/+download/veracrypt-console-${VERSION_PUBLISHED}-${UPSTREAM_ID^}-${UPSTREAM_RELEASE}-${HOST_ARCH}.deb\"")
fi
PRETTY_NAME="Veracrypt Console"
WEBSITE="https://www.veracrypt.fr/en/Downloads.html"
SUMMARY="VeraCrypt is a free and open-source utility for on-the-fly encryption (OTFE)."
11 changes: 6 additions & 5 deletions deb-get
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ LC_ALL=C
PACKAGE_INSTALLATION_TRIES=0
PACKAGE_INSTALLATION_COUNT=0

readonly VERSION="0.4.2"
readonly VERSION="0.4.3"

# set a github auth token (e.g a PAT ) in DEBGET_TOKEN to get a bigger rate limit
if [ -n "${DEBGET_TOKEN}" ]; then
Expand Down Expand Up @@ -181,21 +181,21 @@ function get_gitlab_releases() {
METHOD="gitlab"
CACHE_FILE="${CACHE_DIR}/${APP}.json"
# Cache gitlab releases json for 1 hour to try and prevent API rate limits
#
#
# Do not process gitlab releases while generating a pretty list or upgrading
# if $1 is org/app or user/repo it must be urlencoded
# the gitlab api can take a release or use permalink/latest to get the latest release
# So for gitlab sourced apps that use this release model users can use 99-local to pin a version
#
#

if [[ ' install update fix-installed ' =~ " ${ACTION} " ]]; then
if [ ! -e "${CACHE_FILE}" ] || [ -n "$(find "${CACHE_FILE}" -mmin +"${DEBGET_CACHE_RTN:-60}")" ]; then
fancy_message info "Updating ${CACHE_FILE}"
RELEASE=${2/%latest/permalink/latest}

local URL="https://gitlab.com/api/v4/projects/${1}/releases/${RELEASE}/assets/links"
local URL="https://gitlab.com/api/v4/projects/${1}/releases/${RELEASE}/assets/links"
wgetcmdarray=(wget -q --no-use-server-timestamps "${URL}" -O "${CACHE_FILE}")

${ELEVATE} "${wgetcmdarray[@]}" || ( fancy_message warn "Updating ${CACHE_FILE} failed." )
fi
fi
Expand Down Expand Up @@ -1298,6 +1298,7 @@ esac
OS_ID=$(lsb_release --id --short)
case "${OS_ID}" in
Debian) OS_ID_PRETTY="Debian";;
elementary|Elementary) OS_ID_PRETTY="elementary OS";;
Linuxmint) OS_ID_PRETTY="Linux Mint";;
Neon) OS_ID_PRETTY="KDE Neon";;
Pop) OS_ID_PRETTY="Pop!_OS";;
Expand Down