Code cleanup

pkg/appimage/appimage.sh

@@ -4,12 +4,12 @@ PKGNAME='ocs-manager'
 PKGVER='0.5.4'
 PKGREL='1'
 
-curl -L -o linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-chmod 755 linuxdeployqt
-./linuxdeployqt --appimage-extract
+curl -fsSL -o linuxdeployqt.AppImage https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
+chmod 755 linuxdeployqt.AppImage
+./linuxdeployqt.AppImage --appimage-extract
 
 sh scripts/prepare.sh
-qmake PREFIX="/usr"
+qmake PREFIX=/usr
 make
 make INSTALL_ROOT="${PKGNAME}.AppDir" install
 

scripts/build-docker.sh

@@ -20,8 +20,8 @@ transfer_file() {
     if [ -f "${filepath}" ]; then
         filename="$(basename "${filepath}")"
         echo "Uploading ${filename}" >> "${TRANSFERLOG}"
-        curl -T "${filepath}" "https://transfer.sh/${filename}" >> "${TRANSFERLOG}"
-        echo "" >> "${TRANSFERLOG}"
+        curl -fsSL -T "${filepath}" "https://transfer.sh/${filename}" >> "${TRANSFERLOG}"
+        echo '' >> "${TRANSFERLOG}"
     fi
 }
 
@@ -47,10 +47,9 @@ build_appimage() {
     apt -y install libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libxpm-dev
 
     useradd -m ${PKGUSER}
-    export HOME="/home/${PKGUSER}"
     chown -R ${PKGUSER}:${PKGUSER} "${PROJDIR}"
 
-    su -c "source /opt/qt59/bin/qt59-env.sh && sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER}
+    su -c "export HOME=/home/${PKGUSER} && source /opt/qt59/bin/qt59-env.sh && sh "${BUILDSCRIPT}" ${BUILDTYPE}" ${PKGUSER}
 
     transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.AppImage")"
 }

scripts/build.sh

@@ -25,7 +25,7 @@ build_appimage() {
     mkdir -p "${BUILDDIR}"
     export_srcarchive "${SRCARCHIVE}"
 
-    tar -xzvf "${SRCARCHIVE}" -C "${BUILDDIR}"
+    tar -xzf "${SRCARCHIVE}" -C "${BUILDDIR}"
     cp "${PROJDIR}/pkg/appimage/appimage.sh" "${BUILDDIR}/${PKGNAME}"
     cd "${BUILDDIR}/${PKGNAME}"
     sh appimage.sh