From 04064ba190314cd37d535346b4950366e5ae2d41 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 9 Feb 2020 12:07:20 +0000
Subject: user/*: Stop using bash substitutions

---
 user/convertlit/APKBUILD | 2 +-
 user/fira/APKBUILD       | 2 +-
 user/fontforge/APKBUILD  | 2 +-
 user/py3-psutil/APKBUILD | 2 +-
 user/py3-tz/APKBUILD     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'user')

diff --git a/user/convertlit/APKBUILD b/user/convertlit/APKBUILD
index d7b886afb..19bea9b84 100644
--- a/user/convertlit/APKBUILD
+++ b/user/convertlit/APKBUILD
@@ -11,7 +11,7 @@ license="GPL-2.0"
 depends=""
 makedepends="libtommath-dev"
 subpackages=""
-source="http://www.convertlit.com/${pkgname}${pkgver/./}src.zip
+source="http://www.convertlit.com/${pkgname}$(echo $pkgver | sed s/\\.//)src.zip
 	lib.patch
 	"
 builddir="$srcdir/"
diff --git a/user/fira/APKBUILD b/user/fira/APKBUILD
index 8d0b68e9b..15770d162 100644
--- a/user/fira/APKBUILD
+++ b/user/fira/APKBUILD
@@ -14,7 +14,7 @@ depends="fontconfig"
 makedepends=""
 subpackages=""
 source="https://bboxtype.com/downloads/Fira/Download_Folder_FiraSans_$_pkgver.zip
-	https://bboxtype.com/downloads/Fira/Fira_Mono_${_monover/./_}.zip"
+	https://bboxtype.com/downloads/Fira/Fira_Mono_$(echo $_monover | sed s/\\./_/).zip"
 
 package() {
 	cd "$srcdir"/Download_Folder_FiraSans_$_pkgver/Fonts/Fira_Sans_OTF_$_pkgver
diff --git a/user/fontforge/APKBUILD b/user/fontforge/APKBUILD
index 2566d470c..960232ba5 100644
--- a/user/fontforge/APKBUILD
+++ b/user/fontforge/APKBUILD
@@ -12,7 +12,7 @@ makedepends="freetype-dev giflib-dev glib-dev libjpeg-turbo-dev libtool
 	libuninameslist-dev libpng-dev libx11-dev libxml2-dev pango-dev
 	python3-dev tiff-dev zlib-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://github.com/fontforge/fontforge/releases/download/${pkgver/2.0./}/fontforge-dist-${pkgver/2.0./}.tar.xz
+source="https://github.com/fontforge/fontforge/releases/download/${pkgver#2.0.}/fontforge-dist-${pkgver#2.0.}.tar.xz
 	python3.patch
 	"
 
diff --git a/user/py3-psutil/APKBUILD b/user/py3-psutil/APKBUILD
index 3acb26611..98b23873e 100644
--- a/user/py3-psutil/APKBUILD
+++ b/user/py3-psutil/APKBUILD
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 depends="python3"
 makedepends="python3-dev utmps-dev"
 subpackages=""
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
+source="https://files.pythonhosted.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz
 	utmpx.patch
 	"
 builddir="$srcdir/$_pkgname-$pkgver"
diff --git a/user/py3-tz/APKBUILD b/user/py3-tz/APKBUILD
index fde36bc21..1c9545f24 100644
--- a/user/py3-tz/APKBUILD
+++ b/user/py3-tz/APKBUILD
@@ -14,7 +14,7 @@ options="!check" # flake8, sphinx
 depends="python3 tzdata"
 makedepends="python3-dev unzip"
 subpackages=""
-source="https://pypi.io/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
+source="https://pypi.io/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz
 	zoneinfo-noinstall.patch
 	zoneinfo-fix.patch"
 builddir="$srcdir/$_pkgname-$pkgver"
-- 
cgit v1.2.3-70-g09d2