Cleanup bash shell quoting using shellharden

1 files changed, 45 insertions, 45 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 374fe3563ead..62f2b23cd910 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,14 +21,14 @@ optdepends=(
     'percona-server: SQL server storage'
     'postgresql: SQL server storage'
 )
-backup=("etc/webapps/${pkgname}/config.json")
+backup=("etc/webapps/$pkgname/config.json")
 source=(
-    ${pkgname}-server-${pkgver}.tar.gz::"https://github.com/${pkgname}/${pkgname}-server/archive/v${pkgver}.tar.gz"
-    ${pkgname}-webapp-${pkgver}.tar.gz::"https://github.com/${pkgname}/${pkgname}-webapp/archive/v${pkgver}.tar.gz"
+    "$pkgname-server-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname-server/archive/v$pkgver.tar.gz"
+    "$pkgname-webapp-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname-webapp/archive/v$pkgver.tar.gz"
     "mattermost-ldflags.patch"
-    "${pkgname}.service"
-    "${pkgname}.sysusers"
-    "${pkgname}.tmpfiles"
+    "$pkgname.service"
+    "$pkgname.sysusers"
+    "$pkgname.tmpfiles"
 )
 sha512sums=('7845cd37ecf85a4414eca887ebb3894be34dff66c2f832bedf58d8d08e69ccdbdf41218322cdaade44e460a676728a0d480eb86c1387faba260257a7d0a3cf89'
             '16e6671dab37b8e422915920111a9b69e84adc042a66c14fe5638a665e242f14c474e795d5abb65e76093dc7ce5b5d94e82fe77f6d58f7bdd14cbcfa1b8817b4'
@@ -47,26 +47,26 @@ prepare() {
     # cp -RL ../mattermost-webapp/dist/* dist/mattermost/client/
     # this command will fail with
     # cp: cannot stat '../mattermost-webapp/dist/*': No such file or directory
-    cd ${srcdir}
-    rm -rf ${pkgname}-server ${pkgname}-webapp
-    mv ${pkgname}-server-${pkgver} ${pkgname}-server
-    mv ${pkgname}-webapp-${pkgver} ${pkgname}-webapp
+    cd "$srcdir"
+    rm -rf "$pkgname"-server "$pkgname"-webapp
+    mv "$pkgname-server-$pkgver" "$pkgname"-server
+    mv "$pkgname-webapp-$pkgver" "$pkgname"-webapp
 
-    mkdir -p src/github.com/${pkgname}
-    cd src/github.com/${pkgname}
+    mkdir -p src/github.com/"$pkgname"
+    cd src/github.com/"$pkgname"
 
     # Remove previous platform folders if any previous clone was effective
-    rm -f ${pkgname}-server
-    rm -f ${pkgname}-webapp
+    rm -f "$pkgname"-server
+    rm -f "$pkgname"-webapp
 
     # Create the directory structure to match Go namespaces
-    ln -s "${srcdir}"/${pkgname}-server ${pkgname}-server
-    ln -s "${srcdir}"/${pkgname}-webapp ${pkgname}-webapp
-    cd ${pkgname}-server
+    ln -s "$srcdir"/"$pkgname"-server "$pkgname"-server
+    ln -s "$srcdir"/"$pkgname"-webapp "$pkgname"-webapp
+    cd "$pkgname"-server
 
     # Pass Arch Linux's Go compilation flags to Mattermost in order to take
     # into account advanced features like PIE.
-    patch < "${srcdir}"/mattermost-ldflags.patch
+    patch < "$srcdir"/mattermost-ldflags.patch
 
     # We are not using docker, no need to stop it.
     sed -r -i Makefile \
@@ -80,7 +80,7 @@ prepare() {
     # The Go programming language only supports 8 instruction sets, therefore
     # we cannot rely on ${CARCH} and need to cast manually.
     # src.: https://golang.org/doc/install/source#introduction
-    case "${CARCH}" in
+    case "$CARCH" in
         i686)
             sed -r -i build/release.mk \
                 -e "5,7s/amd64/386/"
@@ -105,18 +105,18 @@ prepare() {
     # inspired compilation date format without any letter format (only use
     # numbers).
     sed -r -i Makefile \
-        -e "s/^(\s*)BUILD_HASH =.*/\1BUILD_HASH = ${pkgver}-${pkgrel} Arch Linux \(${CARCH}\)/" \
+        -e "s/^(\s*)BUILD_HASH =.*/\1BUILD_HASH = $pkgver-$pkgrel Arch Linux \($CARCH\)/" \
         -e 's/BUILD_DATE = \$\(shell date -u\)/BUILD_DATE = \$(shell date -u +'"'"'%Y-%m-%d %H:%M:%S'"'"')/'
 
     # Enforce build hash to Arch Linux as well for the field corresponding to
     # the webapp.
-    cd "${srcdir}/${pkgname}-webapp"
+    cd "$srcdir/$pkgname-webapp"
     sed -r -i webpack.config.js \
-        -e "s/^(\s*)COMMIT_HASH:(.*),$/\1COMMIT_HASH: JSON.stringify\(\"${pkgver}-${pkgrel} Arch Linux \(${CARCH}\)\"\),/"
+        -e "s/^(\s*)COMMIT_HASH:(.*),$/\1COMMIT_HASH: JSON.stringify\(\"$pkgver-$pkgrel Arch Linux \($CARCH\)\"\),/"
 
     # Link against system gifsicle
     if [ "$CARCH" != 'x86_64' ]; then
-        gifsicleNpm="${srcdir}/${pkgname}-webapp/node_modules/gifsicle/vendor/gifsicle"
+        gifsicleNpm="$srcdir/$pkgname-webapp/node_modules/gifsicle/vendor/gifsicle"
         gifsicleNpm="${gifsicleNpm//\//\\/}"
         gifsicleSystem="$(which gifsicle)"
         gifsicleSystem="${gifsicleSystem//\//\\/}"
@@ -129,47 +129,47 @@ build() {
     # No need to build mattermost-webapp as the server is taking care of this
     # step via its build-client make instruction.
 
-    cd "${srcdir}"/src/github.com/${pkgname}/${pkgname}-server
+    cd "$srcdir"/src/github.com/"$pkgname/$pkgname"-server
     # Prevent the build to crash when some dependencies are not met or
     # outdated. This cleans the webapp as well (cf. mattermost-server/Makefile,
     # clean target).
     make clean
-    GOPATH="${srcdir}" BUILD_NUMBER=${pkgver}-${pkgrel} make build-linux
-    GOPATH="${srcdir}" BUILD_NUMBER=${pkgver}-${pkgrel} make build-client
-    GOPATH="${srcdir}" BUILD_NUMBER=${pkgver}-${pkgrel} make package
+    GOPATH="$srcdir" BUILD_NUMBER=$pkgver-$pkgrel make build-linux
+    GOPATH="$srcdir" BUILD_NUMBER=$pkgver-$pkgrel make build-client
+    GOPATH="$srcdir" BUILD_NUMBER=$pkgver-$pkgrel make package
 }
 
 package() {
-    cd "${srcdir}"/src/github.com/${pkgname}/${pkgname}-server
+    cd "$srcdir"/src/github.com/"$pkgname/$pkgname"-server
 
     install -dm755 \
-        "${pkgdir}"/usr/bin \
-        "${pkgdir}"/usr/share/webapps \
-        "${pkgdir}"/etc/webapps \
-        "${pkgdir}"/usr/share/doc/${pkgname}
+        "$pkgdir"/usr/bin \
+        "$pkgdir"/usr/share/webapps \
+        "$pkgdir"/etc/webapps \
+        "$pkgdir"/usr/share/doc/"$pkgname"
 
-    cp -a dist/${pkgname} "${pkgdir}"/usr/share/webapps/
+    cp -a dist/"$pkgname" "$pkgdir"/usr/share/webapps/
 
-    cd "${pkgdir}"/usr/share/webapps/${pkgname}
+    cd "$pkgdir"/usr/share/webapps/"$pkgname"
     install -dm755 client/plugins
 
     rm -rf logs
-    ln -s /var/log/${pkgname} logs
+    ln -s /var/log/"$pkgname" logs
 
     cp config/default.json config/config.json
-    mv config "${pkgdir}"/etc/webapps/${pkgname}
-    ln -s /etc/webapps/${pkgname} config
+    mv config "$pkgdir"/etc/webapps/"$pkgname"
+    ln -s /etc/webapps/"$pkgname" config
 
     sed -e 's@"Directory": ".*"@"Directory": "/var/lib/mattermost/"@g' \
         -e 's@tcp(dockerhost:3306)@unix(/run/mysqld/mysqld.sock)@g' \
-        -i "${pkgdir}"/etc/webapps/${pkgname}/config.json
+        -i "$pkgdir"/etc/webapps/"$pkgname"/config.json
 
-    mv NOTICE.txt README.md "${pkgdir}"/usr/share/doc/${pkgname}
+    mv NOTICE.txt README.md "$pkgdir"/usr/share/doc/"$pkgname"
 
-    cd "${srcdir}"
-    install -Dm755 "bin/${pkgname}" "${pkgdir}/usr/share/webapps/${pkgname}/bin/${pkgname}"
-    ln -s "/usr/share/webapps/${pkgname}/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${pkgname}.service" -t "${pkgdir}/usr/lib/systemd/system/"
-    install -Dm644 "${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
-    install -Dm644 "${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+    cd "$srcdir"
+    install -Dm755 "bin/$pkgname" "$pkgdir/usr/share/webapps/$pkgname/bin/$pkgname"
+    ln -s "/usr/share/webapps/$pkgname/bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
+    install -Dm644 "$pkgname.service" -t "$pkgdir/usr/lib/systemd/system/"
+    install -Dm644 "$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+    install -Dm644 "$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 }