From 6baa177e2c75f964e9ba914b4cf2176e051dbac3 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Sat, 25 Feb 2017 07:27:49 +0900
Subject: [PATCH] Fix
---
pkg/build.sh | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/pkg/build.sh b/pkg/build.sh
index acf1b38..768fc69 100644
--- a/pkg/build.sh
+++ b/pkg/build.sh
@@ -52,12 +52,12 @@ transfer_file() {
# sudo -u pkgbuilder sh PROJDIR/pkg/build.sh ubuntu
################################################################################
pre_ubuntu() {
-}
-
-build_ubuntu() {
+ cd "${PROJDIR}"
mkdir -p "${BUILDDIR}"
export_srcarchive "${SRCARCHIVE}"
+}
+build_ubuntu() {
tar -xzvf "${SRCARCHIVE}" -C "${BUILDDIR}"
cp -r "${PROJDIR}/pkg/ubuntu/debian" "${BUILDDIR}/${PKGNAME}"
cd "${BUILDDIR}/${PKGNAME}"
@@ -80,12 +80,12 @@ post_ubuntu() {
# sudo -u pkgbuilder sh PROJDIR/pkg/build.sh fedora
################################################################################
pre_fedora() {
-}
-
-build_fedora() {
+ cd "${PROJDIR}"
mkdir -p "${BUILDDIR}"
export_srcarchive "${SRCARCHIVE}"
+}
+build_fedora() {
mkdir "${BUILDDIR}/SOURCES"
mkdir "${BUILDDIR}/SPECS"
mv "${SRCARCHIVE}" "${BUILDDIR}/SOURCES"
@@ -110,12 +110,12 @@ post_fedora() {
# sudo -u pkgbuilder sh PROJDIR/pkg/build.sh archlinux
################################################################################
pre_archlinux() {
-}
-
-build_archlinux() {
+ cd "${PROJDIR}"
mkdir -p "${BUILDDIR}"
export_srcarchive "${SRCARCHIVE}"
+}
+build_archlinux() {
cp "${PROJDIR}/pkg/archlinux/PKGBUILD" "${BUILDDIR}"
cd "${BUILDDIR}"
updpkgsums
@@ -139,12 +139,12 @@ post_archlinux() {
# sudo -u pkgbuilder sh PROJDIR/pkg/build.sh snap
################################################################################
pre_snap() {
-}
-
-build_snap() {
+ cd "${PROJDIR}"
mkdir -p "${BUILDDIR}"
export_srcarchive "${SRCARCHIVE}"
+}
+build_snap() {
tar -xzvf "${SRCARCHIVE}" -C "${BUILDDIR}"
cp "${PROJDIR}/pkg/snap/snapcraft.yaml" "${BUILDDIR}/${PKGNAME}"
cp -r "${PROJDIR}/pkg/snap/setup" "${BUILDDIR}/${PKGNAME}"
@@ -171,13 +171,12 @@ post_snap() {
################################################################################
pre_appimage() {
cd "${PROJDIR}"
+ mkdir -p "${BUILDDIR}"
+ export_srcarchive "${SRCARCHIVE}"
export VERSION="$(git describe --always)"
}
build_appimage() {
- mkdir -p "${BUILDDIR}"
- export_srcarchive "${SRCARCHIVE}"
-
tar -xzvf "${SRCARCHIVE}" -C "${BUILDDIR}"
cd "${BUILDDIR}/${PKGNAME}"
qmake
--
GitLab