summaryrefslogtreecommitdiff
path: root/experimental
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-07-22 19:43:53 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-07-22 19:43:53 +0000
commitb7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71 (patch)
tree5948e97345062a759a5ab8d355b0b49849abcfcf /experimental
parentd61220e97e3a4fec8c1e43970cb1408f790c2c2e (diff)
parent6bd200ed124893c95fda0335b684b26eba0bb743 (diff)
downloadpackages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.gz
packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.bz2
packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.xz
packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.zip
Merge branch 'bashisms' into 'master'
Purge bashisms, adduser, and addgroup from packages.git See merge request adelie/packages!293
Diffstat (limited to 'experimental')
-rw-r--r--experimental/cython/APKBUILD4
-rw-r--r--experimental/firefox-esr/APKBUILD4
-rw-r--r--experimental/firefox/APKBUILD4
-rw-r--r--experimental/lmms/APKBUILD5
-rw-r--r--experimental/py3-hbmqtt/APKBUILD6
-rw-r--r--experimental/qt5-qtwebkit/APKBUILD4
-rw-r--r--experimental/thunderbird/APKBUILD2
7 files changed, 17 insertions, 12 deletions
diff --git a/experimental/cython/APKBUILD b/experimental/cython/APKBUILD
index 34bcf9a99..eb9609f74 100644
--- a/experimental/cython/APKBUILD
+++ b/experimental/cython/APKBUILD
@@ -2,6 +2,8 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=cython
_pkgname=Cython
+_p="${_pkgname#?}"
+_p="${_pkgname%"$_p"}"
pkgver=0.29.12
pkgrel=0
pkgdesc="C extension compiler for Python"
@@ -11,7 +13,7 @@ license="Apache-2.0"
depends=""
makedepends="python3-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"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
diff --git a/experimental/firefox-esr/APKBUILD b/experimental/firefox-esr/APKBUILD
index ae94ce6e7..15191dba8 100644
--- a/experimental/firefox-esr/APKBUILD
+++ b/experimental/firefox-esr/APKBUILD
@@ -82,7 +82,7 @@ prepare() {
echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig
echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig
# too much memory
- if [ -z "$JOBS" -o $JOBS -gt 32 ]; then
+ if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then
echo "mk_add_options MOZ_MAKE_FLAGS=\"-j32\"" >> "$builddir"/mozconfig
fi
}
@@ -117,7 +117,7 @@ package() {
local png
for png in browser/branding/official/default*.png; do
- local i=${_png%.png}
+ local i="${_png%.png}"
i=${i##*/default}
install -D -m644 "$png" \
"$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png
diff --git a/experimental/firefox/APKBUILD b/experimental/firefox/APKBUILD
index 828754077..8d6a24d9b 100644
--- a/experimental/firefox/APKBUILD
+++ b/experimental/firefox/APKBUILD
@@ -59,7 +59,7 @@ prepare() {
echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig
echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig
# too much memory
- if [ -z "$JOBS" -o $JOBS -gt 16 ]; then
+ if [ -z "$JOBS" ] || [ $JOBS -gt 16 ]; then
echo "mk_add_options MOZ_MAKE_FLAGS=\"-j16\"" >> "$builddir"/mozconfig
fi
}
@@ -100,7 +100,7 @@ package() {
local png
for png in browser/branding/official/default*.png; do
- local i=${_png%.png}
+ local i="${_png%.png}"
i=${i##*/default}
install -D -m644 "$png" \
"$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png
diff --git a/experimental/lmms/APKBUILD b/experimental/lmms/APKBUILD
index 5a045f66e..6724d80ef 100644
--- a/experimental/lmms/APKBUILD
+++ b/experimental/lmms/APKBUILD
@@ -2,6 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=lmms
pkgver=1.2.0
+_pkgver=$(printf '%s' "$pkgver" | sed 's/_/-/')
pkgrel=0
pkgdesc="Music production software"
url="https://lmms.io/"
@@ -13,13 +14,13 @@ makedepends="alsa-lib-dev cmake fftw-dev fltk-dev fluidsynth-dev lame-dev
pulseaudio-dev qt5-qtbase-dev qt5-qttools-dev qt5-qtx11extras-dev
sdl-dev extra-cmake-modules xcb-util-dev xcb-util-keysyms-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="lmms-${pkgver/_/-}.tar.gz::https://github.com/LMMS/lmms/archive/v${pkgver/_/-}.tar.gz
+source="lmms-$_pkgver.tar.gz::https://github.com/LMMS/lmms/archive/v$_pkgver.tar.gz
https://distfiles.adelielinux.org/source/qt5-x11embed-20171106.tar.xz
rpmalloc-1.3.1.tar.gz::https://github.com/rampantpixels/rpmalloc/archive/1.3.1.tar.gz
thread.patch
use-system-ecm.patch
"
-builddir="$srcdir"/lmms-${pkgver/_/-}
+builddir="$srcdir/lmms-$_pkgver"
prepare() {
cd "$builddir"
diff --git a/experimental/py3-hbmqtt/APKBUILD b/experimental/py3-hbmqtt/APKBUILD
index e3f10e5ca..35172edf4 100644
--- a/experimental/py3-hbmqtt/APKBUILD
+++ b/experimental/py3-hbmqtt/APKBUILD
@@ -2,7 +2,9 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=py3-hbmqtt
_pkgname=${pkgname#py3-}
-pkgver=0.9.5
+_p="${_pkgname#?}"
+_p="${_pkgname%"$_p"}"
+pkgver=0.9.5
pkgrel=0
pkgdesc="MQTT client/broker using Python and asyncio"
url="https://pypi.org/project/hbmqtt/"
@@ -12,7 +14,7 @@ depends="python3"
checkdepends="py3-docopt py3-passlib py3-pyyaml py3-six py3-transitions py3-websockets"
makedepends="python3-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"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
diff --git a/experimental/qt5-qtwebkit/APKBUILD b/experimental/qt5-qtwebkit/APKBUILD
index fb6c39631..c7e0834e5 100644
--- a/experimental/qt5-qtwebkit/APKBUILD
+++ b/experimental/qt5-qtwebkit/APKBUILD
@@ -3,7 +3,7 @@
pkgname=qt5-qtwebkit
_realname=qtwebkit
pkgver=5.212.0_alpha2
-_realver=${pkgver/_/-}
+_realver=$(printf '%s' "$pkgver" | sed 's/_/-/')
pkgrel=0
pkgdesc="Open source Web browser engine"
url="https://github.com/annulen/webkit"
@@ -72,7 +72,7 @@ build() {
-DUSE_SYSTEM_MALLOC=ON \
${CMAKE_CROSSOPTS}
# too memory hungry
- if [ -z "$JOBS" -o $JOBS -gt 32 ]; then
+ if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then
make -j32
else
make
diff --git a/experimental/thunderbird/APKBUILD b/experimental/thunderbird/APKBUILD
index 4a98b52b4..92dffeb6b 100644
--- a/experimental/thunderbird/APKBUILD
+++ b/experimental/thunderbird/APKBUILD
@@ -78,7 +78,7 @@ prepare() {
echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig
echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig
# too much memory
- if [ -z "$JOBS" -o $JOBS -gt 32 ]; then
+ if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then
echo "mk_add_options MOZ_MAKE_FLAGS=\"-j32\"" >> "$builddir"/mozconfig
fi
}