From b16868025232e2e78a59ddc16cc240102f5ebb3d Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Tue, 6 Feb 2018 20:31:58 +0900
Subject: [PATCH] Code cleanup
---
.travis.yml | 2 --
scripts/build-docker.sh | 24 ++++++++++++------------
scripts/build.sh | 24 ++++++++++++------------
3 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 310824f..e2d9723 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,5 @@ branches:
script:
- mntdir='/mnt/ocs-manager'
- #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh snap"
- #- docker run --rm -v $(pwd):${mntdir} ubuntu:16.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh flatpak"
- docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/build-docker.sh appimage"
- cat transfer.log
diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
index f6e1726..4a1cac6 100644
--- a/scripts/build-docker.sh
+++ b/scripts/build-docker.sh
@@ -25,14 +25,6 @@ transfer_file() {
fi
}
-build_snap() {
- echo 'Not implemented yet'
-}
-
-build_flatpak() {
- echo 'Not implemented yet'
-}
-
build_appimage() {
# docker-image: ubuntu:14.04
@@ -63,13 +55,21 @@ build_appimage() {
transfer_file "$(find "${PROJDIR}/build_"*${BUILDTYPE} -type f -name "${PKGNAME}*.AppImage")"
}
-if [ "${BUILDTYPE}" = 'snap' ]; then
+build_snap() {
+ echo 'Not implemented yet'
+}
+
+build_flatpak() {
+ echo 'Not implemented yet'
+}
+
+if [ "${BUILDTYPE}" = 'appimage' ]; then
+ build_appimage
+elif [ "${BUILDTYPE}" = 'snap' ]; then
build_snap
elif [ "${BUILDTYPE}" = 'flatpak' ]; then
build_flatpak
-elif [ "${BUILDTYPE}" = 'appimage' ]; then
- build_appimage
else
- echo "sh $(basename "${0}") [snap|flatpak|appimage]"
+ echo "sh $(basename "${0}") [appimage|snap|flatpak]"
exit 1
fi
diff --git a/scripts/build.sh b/scripts/build.sh
index a403d8a..36363d9 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -20,14 +20,6 @@ export_srcarchive() {
$(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${filepath}" HEAD)
}
-build_snap() {
- echo 'Not implemented yet'
-}
-
-build_flatpak() {
- echo 'Not implemented yet'
-}
-
build_appimage() {
cd "${PROJDIR}"
mkdir -p "${BUILDDIR}"
@@ -39,13 +31,21 @@ build_appimage() {
sh appimage.sh
}
-if [ "${BUILDTYPE}" = 'snap' ]; then
+build_snap() {
+ echo 'Not implemented yet'
+}
+
+build_flatpak() {
+ echo 'Not implemented yet'
+}
+
+if [ "${BUILDTYPE}" = 'appimage' ]; then
+ build_appimage
+elif [ "${BUILDTYPE}" = 'snap' ]; then
build_snap
elif [ "${BUILDTYPE}" = 'flatpak' ]; then
build_flatpak
-elif [ "${BUILDTYPE}" = 'appimage' ]; then
- build_appimage
else
- echo "sh $(basename "${0}") [snap|flatpak|appimage]"
+ echo "sh $(basename "${0}") [appimage|snap|flatpak]"
exit 1
fi
--
GitLab