From 69fb27c6e17a7ccca89e5c2a046deb891cbc5070 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Fri, 25 Aug 2017 16:35:10 +0000
Subject: [PATCH] Code cleanup
---
pkg/appimage/appimage.sh | 13 +++++++------
scripts/build-docker.sh | 4 ----
scripts/build.sh | 4 ----
scripts/import.sh | 4 ----
4 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/pkg/appimage/appimage.sh b/pkg/appimage/appimage.sh
index c46d22d..075a265 100644
--- a/pkg/appimage/appimage.sh
+++ b/pkg/appimage/appimage.sh
@@ -1,18 +1,19 @@
#!/bin/sh
PKGNAME='ocs-url'
+PKGVER='0.0.0'
+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
sh scripts/import.sh
qmake PREFIX="/usr"
make
make INSTALL_ROOT="${PKGNAME}.AppDir" install
-curl -L -o linuxdeployqt "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
-chmod 755 linuxdeployqt
-./linuxdeployqt --appimage-extract
-
./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -bundle-non-qt-libs -no-translations -qmldir="app/qml"
./squashfs-root/AppRun ${PKGNAME}.AppDir/usr/share/applications/${PKGNAME}.desktop -appimage
-mv *.AppImage rename.AppImage
-mv rename.AppImage ${PKGNAME}-x86_64.AppImage
+mv *.AppImage ${PKGNAME}-${PKGVER}-${PKGREL}-x86_64.AppImage
diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
index 3959464..5a52971 100644
--- a/scripts/build-docker.sh
+++ b/scripts/build-docker.sh
@@ -1,9 +1,5 @@
#!/bin/bash
-################################################################################
-# This is wrapper script for build.sh use from inside docker container
-################################################################################
-
PKGNAME='ocs-url'
PKGUSER='pkgbuilder'
diff --git a/scripts/build.sh b/scripts/build.sh
index 1553b80..2e6328e 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,9 +1,5 @@
#!/bin/bash
-################################################################################
-# This is utility script to build distribution packages
-################################################################################
-
PKGNAME='ocs-url'
BUILDTYPE=''
diff --git a/scripts/import.sh b/scripts/import.sh
index daddb4d..64f9385 100644
--- a/scripts/import.sh
+++ b/scripts/import.sh
@@ -1,9 +1,5 @@
#!/bin/bash
-################################################################################
-# This is utility script to import build dependencies
-################################################################################
-
PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
if [ ! -d "${PROJDIR}/lib/qtlib" ]; then
--
GitLab