Skip to content

Commit 407c0fd

Browse files
davidnewhalldavidnewhall
committed
update arch pkgbuild
1 parent 88d3b8a commit 407c0fd

4 files changed

Lines changed: 44 additions & 38 deletions

File tree

‎init/archlinux/PKGBUILD.template‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1-
pkgname=unpackerr
1+
# Maintainer: David Newhall II <[email protected]>
2+
# Maintainer: Donald Webster <[email protected]>
3+
4+
pkgname='unpackerr'
25
pkgver={{VERSION}}
36
pkgrel={{Iter}}
47
pkgdesc='{{Desc}}'
58
arch=('x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64' 'i686' 'pentium4')
6-
url='https://golift.io/unpackerr'
9+
url='https://unpackerr.zip'
710
license=('MIT')
811
makedepends=('go' 'gzip')
12+
optdepends=(
13+
'transmission-cli: torrent downloader (CLI and daemon)'
14+
'transmission-gtk: torrent downloader (GTK+)'
15+
'transmission-qt: torrent downloader (Qt)'
16+
'deluge: torrent downloader'
17+
'rtorrent: torrent downloader'
18+
)
919

1020
source=("${pkgname}-${pkgver}.tar.gz::{{SOURCE_PATH}}")
1121
sha512sums=('{{SHA}}')
@@ -32,10 +42,10 @@ build() {
3242
-X golift.io/version.Version=${pkgver}"
3343

3444
go build -o unpackerr -ldflags "$VLDFLAGS" .
35-
go run github.com/davidnewhall/[email protected] --manual unpackerr --version ${pkgver} --date "${DATE}" README.md
36-
go run github.com/davidnewhall/[email protected] --manual unpackerr --version ${pkgver} --date "${DATE}" examples/MANUAL.md
45+
go run github.com/davidnewhall/[email protected] --manual unpackerr --version "${pkgver}" --date "${DATE}" README.md
46+
go run github.com/davidnewhall/[email protected] --manual unpackerr --version "${pkgver}" --date "${DATE}" examples/MANUAL.md
3747
gzip -9 examples/MANUAL
38-
mv examples/MANUAL.gz ${pkgname}.1.gz
48+
mv examples/MANUAL.gz "${pkgname}.1.gz"
3949
}
4050

4151
package() {
@@ -53,7 +63,7 @@ package() {
5363

5464
# License, documentation, manual.
5565
install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
56-
install -D -m 644 *.html examples/* "${pkgdir}/usr/share/doc/${pkgname}/"
66+
install -D -m 644 ./*.html examples/* "${pkgdir}/usr/share/doc/${pkgname}/"
5767
install -D -m 644 "${pkgname}.1.gz" "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz"
5868

5969
# Install the systemd service unit and system user account.

‎init/archlinux/SRCINFO.template‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pkgbase = unpackerr
22
pkgdesc = {{Desc}}
33
pkgver = {{VERSION}}
44
pkgrel = {{Iter}}
5-
url = https://golift.io/unpackerr
5+
url = https://unpackerr.zip
66
arch = x86_64
77
arch = arm
88
arch = armv6h
@@ -13,6 +13,11 @@ pkgbase = unpackerr
1313
license = MIT
1414
makedepends = go
1515
makedepends = gzip
16+
optdepends = transmission-cli: torrent downloader (CLI and daemon)
17+
optdepends = transmission-gtk: torrent downloader (GTK+)
18+
optdepends = transmission-qt: torrent downloader (Qt)
19+
optdepends = deluge: torrent downloader
20+
optdepends = rtorrent: torrent downloader
1621
backup = etc/unpackerr/unpackerr.conf
1722
source = unpackerr-{{VERSION}}.tar.gz::{{SOURCE_PATH}}
1823
sha512sums = {{SHA}}

‎init/archlinux/aur-deploy.sh‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55

66
source settings.sh
77

8-
SOURCE_PATH=https://github.com/Unpackerr/unpackerr/archive/v${VERSION}.tar.gz
8+
SOURCE_PATH="https://github.com/Unpackerr/unpackerr/archive/v${VERSION}.tar.gz"
99
echo "==> Using URL: $SOURCE_PATH"
10-
SHA=$(curl -sL $SOURCE_PATH | sha512sum | awk '{print $1}')
10+
SHA=$(curl -sL "$SOURCE_PATH" | sha512sum | awk '{print $1}')
1111

1212
push_it() {
13+
git config user.email "[email protected]"
14+
git config user.name "unpackerr-auto-releaser"
1315
pushd release_repo
1416
git add .
1517
git commit -m "Update unpackerr on Release: v${VERSION}-${ITERATION}"
@@ -20,25 +22,14 @@ push_it() {
2022

2123
set -e
2224

23-
# Make an id_rsa file with our secret.
24-
mkdir -p $HOME/.ssh
25-
KEY_FILE="$(mktemp -u $HOME/.ssh/XXXXX)"
25+
KEY_FILE=$(mktemp -u "$HOME"/.ssh/XXXXX)
2626
echo "${DEPLOY_KEY}" > "${KEY_FILE}"
2727
chmod 600 "${KEY_FILE}"
28-
# Configure ssh to use this secret on a custom hostname.
29-
AUR_HOST="arch.$(basename $KEY_FILE)"
30-
printf "%s\n" \
31-
"Host $AUR_HOST" \
32-
" HostName aur.archlinux.org" \
33-
" IdentityFile ${KEY_FILE}" \
34-
" StrictHostKeyChecking no" \
35-
" LogLevel ERROR" | tee -a $HOME/.ssh/config
36-
37-
git config --global user.email "[email protected]"
38-
git config --global user.name "unpackerr-auto-releaser"
28+
# Configure ssh to use this secret.
29+
export GIT_SSH_COMMAND="ssh -i ${KEY_FILE} -o 'StrictHostKeyChecking no'"
3930

4031
rm -rf release_repo
41-
git clone aur@${AUR_HOST}:unpackerr.git release_repo
32+
git clone aur@aur.archlinux.org:unpackerr.git release_repo
4233

4334
sed -e "s/{{VERSION}}/${VERSION}/g" \
4435
-e "s/{{Iter}}/${ITERATION}/g" \

‎init/install.sh‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ PACKAGE=$(echo "$REPO" | cut -d/ -f 2)
2020

2121
# Nothing else needs to be changed. Unless you're fixing things!
2222

23-
LATEST=https://api.github.com/repos/${REPO}/releases/latest
24-
ISSUES=https://github.com/${REPO}/issues/new
23+
LATEST="https://api.github.com/repos/${REPO}/releases/latest"
24+
ISSUES="https://github.com/${REPO}/issues/new"
2525
ARCH=$(uname -m)
2626
OS=$(uname -s)
2727
P=" ==>"
@@ -89,7 +89,7 @@ PAYLOAD=$($CMD ${LATEST})
8989
URL=$(echo "$PAYLOAD" | grep -E "browser_download_url.*(${ARCH})\.${FILE}\"" | cut -d\" -f 4)
9090
TAG=$(echo "$PAYLOAD" | grep 'tag_name' | cut -d\" -f4 | tr -d v)
9191

92-
if [ "$?" != "0" ] || [ "$URL" = "" ]; then
92+
if [ "${TAG}" = "" ] || [ "${URL}" = "" ]; then
9393
echo "${P} [ERROR] Missing latest release for '${FILE}' file ($OS/${ARCH}) at ${LATEST}"
9494
echo "${P} $(uname -a) $(head -n 1 /etc/issue)"
9595
echo "${P} Please report this error, along with the above OS details:"
@@ -99,17 +99,17 @@ fi
9999

100100
if [ "$FILE" = "rpm" ]; then
101101
INSTALLER="rpm -Uvh"
102-
INSTALLED="$(rpm -q --last --info ${PACKAGE} 2>/dev/null | grep Version | cut -d: -f2 | cut -d- -f1 | awk '{print $1}')"
102+
INSTALLED=$(rpm -q --last --info "${PACKAGE}" 2>/dev/null | grep Version | cut -d: -f2 | cut -d- -f1 | awk '{print $1}')
103103
elif [ "$FILE" = "deb" ]; then
104-
dpkg -s ${PACKAGE} 2>/dev/null | grep Status | grep -q installed
105-
[ "$?" != "0" ] || INSTALLED="$(dpkg -s ${PACKAGE} 2>/dev/null | grep ^Version | cut -d: -f2 | cut -d- -f1 | awk '{print $1}')"
104+
dpkg -s "${PACKAGE}" 2>/dev/null | grep Status | grep -q installed || \
105+
INSTALLED=$(dpkg -s "${PACKAGE}" 2>/dev/null | grep ^Version | cut -d: -f2 | cut -d- -f1 | awk '{print $1}')
106106
INSTALLER="dpkg --force-confdef --force-confold --install"
107107
elif [ "$FILE" = "txz" ]; then
108108
INSTALLER="pkg install --yes"
109-
INSTALLED="$(pkg info ${PACKAGE} 2>/dev/null | grep Version | cut -d: -f2 | cut -d- -f1 | awk '{print $1}')"
109+
INSTALLED=$(pkg info" ${PACKAGE}" 2>/dev/null | grep Version | cut -d: -f2 | cut -d- -f1 | awk '{print $1}')
110110
elif [ "$FILE" = "pkg.tar.zst" ]; then
111111
INSTALLER="pacman --noconfirm --upgrade"
112-
INSTALLED=$(pacman --query ${PACKAGE} 2>/dev/null | awk '{print $2}' | cut -d- -f1)
112+
INSTALLED=$(pacman --query "${PACKAGE}" 2>/dev/null | awk '{print $2}' | cut -d- -f1)
113113
EXTRAS="$CMD https://golift.io/gpg | pacman-key --add -
114114
pacman-key --lsign-key B93DD66EF98E54E2EAE025BA0166AD34ABC5A57C"
115115
fi
@@ -123,7 +123,7 @@ vercomp () {
123123
fi
124124

125125
local IFS=.
126-
local i ver1=($1) ver2=($2)
126+
local i ver1=("$1") ver2=("$2")
127127
# fill empty fields in ver1 with zeros
128128
for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do
129129
ver1[i]=0
@@ -150,23 +150,23 @@ case $? in
150150
3) echo "${P} Installing ${PACKAGE} version ${TAG}." ;;
151151
esac
152152

153-
FILE=$(basename ${URL})
154-
TMPFILE=$(mktemp --tmpdir XXXX-${FILE})
153+
FILE=$(basename "${URL}")
154+
TMPFILE=$(mktemp --tmpdir "XXXX-${FILE}")
155155
echo "${P} Downloading: ${URL}"
156156
echo "${P} To Location: ${TMPFILE}"
157157

158-
if ! $CMD ${URL} > ${TMPFILE}; then
158+
if ! $CMD "${URL}" > "${TMPFILE}"; then
159159
echo "${P} Error writing '${TMPFILE}' file! Fix that, and run this again."
160160
exit 1
161161
fi
162162

163163
# Install it.
164-
if [ "$(id -u)" = "0" ]; then
164+
if (( $(id -u) = 0 )); then
165165
echo "${P} Downloaded. Installing the package!"
166166
echo "${P} Executing: ${EXTRAS}"
167167
eval "${EXTRAS}"
168168
echo "${P} Executing: ${INSTALLER} ${TMPFILE}"
169-
$INSTALLER ${TMPFILE}
169+
$INSTALLER "${TMPFILE}"
170170
echo "<-------------------------------------------------->"
171171
else
172172
echo "${P} Downloaded! Install the package like this:"

0 commit comments

Comments
 (0)