Skip to content

Commit

Permalink
change python-gnupg from PyPI to GitHub
Browse files Browse the repository at this point in the history
This commit changes the location of the dependency files from PyPI to GitHub, since there's currently an upstream bug downloading the signature file from PyPI (404 Not Found):

 * vsajip/python-gnupg#234
  • Loading branch information
maltfield committed Feb 27, 2024
1 parent dfb21b0 commit a103f30
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
15 changes: 11 additions & 4 deletions build/linux/buildAppImage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ set -x
#
# Authors: Michael Altfield <michael@buskill.in>
# Created: 2020-05-30
# Updated: 2021-07-06
# Version: 1.1
# Updated: 2024-02-26
# Version: 1.2
################################################################################

################################################################################
Expand Down Expand Up @@ -229,9 +229,16 @@ tmpDir="`mktemp -d`" || exit 1
${SUDO} chown ${DOWNLOAD_USERNAME}:${CURRENT_GROUP} "${tmpDir}"
${SUDO} chmod 0770 "${tmpDir}"
pushd "${tmpDir}"
${SUDO} ${SU} -c "${PYTHON} -m pip download python-gnupg"

# changing to use the files on GitHub, since the sigs are no longer available
# from PyPI
# * https://github.com/BusKill/buskill-app/issues/78
#${SUDO} ${SU} -c "${PYTHON} -m pip download python-gnupg"
#signature_url=`${SUDO} ${SU} -c "curl -s https://pypi.org/simple/python-gnupg/" | grep -oE "https://.*${filename}#" | sed 's/#/.asc/'`
file_url='https://github.com/vsajip/python-gnupg/releases/download/0.5.2/python_gnupg-0.5.2-py2.py3-none-any.whl'
signature_url='https://github.com/vsajip/python-gnupg/releases/download/0.5.2/python_gnupg-0.5.2-py2.py3-none-any.whl.asc'
${SUDO} ${SU} -c "wget \"${file_url}\""
filename="`ls -1 | head -n1`"
signature_url=`${SUDO} ${SU} -c "curl -s https://pypi.org/simple/python-gnupg/" | grep -oE "https://.*${filename}#" | sed 's/#/.asc/'`
${SUDO} ${SU} -c "wget \"${signature_url}\""

mkdir gnupg
Expand Down
2 changes: 1 addition & 1 deletion docs/software_usr/destructive.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Some people are disappointed when they learn that the BusKill app doesn't includ

The guides linked-to in this section contains experimental files, commands, and software. This information may or may not lead to corruption or total permanent deletion of some or all of your data. We've done our best to carefully guide the reader so they know the risks of each BusKill trigger, but we cannot be responsible for any data loss that has occurred as a result of following these guides.

The contents of this documentation is provided openly and is licensed under the CC-BY-SA license. The software is licensed under the GNU GPLv3 license. All content here is consistent with the limitations of liabilities outlined in its respective licenses.
The contents of this documentation is provided openly and is licensed under the CC BY-SA license. The software is licensed under the GNU GPLv3 license. All content here is consistent with the limitations of liabilities outlined in its respective licenses.

We highly recommend that any experiments with the scripts included in this article are used exclusively on a disposable machine containing no valuable data.

Expand Down

0 comments on commit a103f30

Please sign in to comment.