Resync with mattermost-git package

2 files changed, 50 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 955a2010f83c..ba082253254f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mattermost
 	pkgdesc = Open source Slack-alternative in Golang and React
 	pkgver = 5.14.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://mattermost.com
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 3cfd196104bf..eb8dacdd8da9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=mattermost
 pkgver=5.14.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Open source Slack-alternative in Golang and React'
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='https://mattermost.com'
@@ -13,7 +13,7 @@ license=('AGPL' 'Apache')
 
 makedepends=('git' 'go-pie' 'npm')
 # Experiencing issues with gifsicle and mozjpeg on non x64 architectures.
-if [ "$CARCH" != 'x86_64' ]; then
+if [ "${CARCH}" != 'x86_64' ]; then
     makedepends+=('gifsicle' 'mozjpeg')
 fi
 optdepends=(
@@ -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=(
     '9c215f722c3a40bbf0488a71329aa32461ec04555b5deb2825df2161a1a2a5d91e83469b612f9bcbe7e329386823654492a94ab47b998659ef5237e553bd3b74'
@@ -49,26 +49,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 \
@@ -82,7 +82,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/"
@@ -112,23 +112,23 @@ 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"
+    if [ "${CARCH}" != 'x86_64' ]; then
+        gifsicleNpm="${srcdir}"/${pkgname}-webapp/node_modules/gifsicle/vendor/gifsicle
         gifsicleNpm="${gifsicleNpm//\//\\/}"
         gifsicleSystem="$(which gifsicle)"
         gifsicleSystem="${gifsicleSystem//\//\\/}"
         sed -r -i Makefile \
-            -e "s/(\t*)npm install(.*)/\0\n\trm \"$gifsicleNpm\"\n\tln -s \"$gifsicleSystem\" \"$gifsicleNpm\"/"
+            -e "s/(\t*)npm install(.*)/\0\n\trm \"${gifsicleNpm}\"\n\tln -s \"${gifsicleSystem}\" \"${gifsicleNpm}\"/"
     fi
 }
 
@@ -136,47 +136,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
 }