From d722a16e4ac63272527f692e177c4a455b149bc4 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Sun, 18 Feb 2018 23:34:15 +0900
Subject: [PATCH] Rename scripts
---
.travis.yml | 2 +-
pkg/appimage/{appimage.sh => appimagebuild} | 4 ++--
pkg/pkg.pri | 2 +-
scripts/{package.sh => package} | 4 ++--
scripts/{prepare.sh => prepare} | 0
scripts/scripts.pri | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
rename pkg/appimage/{appimage.sh => appimagebuild} (97%)
rename scripts/{package.sh => package} (95%)
rename scripts/{prepare.sh => prepare} (100%)
diff --git a/.travis.yml b/.travis.yml
index 36f0ca6..00353ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,5 +10,5 @@ branches:
script:
- mntdir='/mnt/ocs-manager'
- - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/package.sh ci_appimage"
+ - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/package ci_appimage"
- cat transfer.log
diff --git a/pkg/appimage/appimage.sh b/pkg/appimage/appimagebuild
similarity index 97%
rename from pkg/appimage/appimage.sh
rename to pkg/appimage/appimagebuild
index bd1ce75..70d5f1b 100644
--- a/pkg/appimage/appimage.sh
+++ b/pkg/appimage/appimagebuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
PKGNAME='ocs-manager'
PKGVER='0.5.5'
@@ -8,7 +8,7 @@ curl -fsSL -o linuxdeployqt.AppImage https://github.com/probonopd/linuxdeployqt/
chmod 755 linuxdeployqt.AppImage
./linuxdeployqt.AppImage --appimage-extract
-sh scripts/prepare.sh
+sh scripts/prepare
qmake PREFIX=/usr
make
make INSTALL_ROOT="${PKGNAME}.AppDir" install
diff --git a/pkg/pkg.pri b/pkg/pkg.pri
index 285c2e5..5108e52 100644
--- a/pkg/pkg.pri
+++ b/pkg/pkg.pri
@@ -1 +1 @@
-DISTFILES += $${PWD}/appimage/appimage.sh
+DISTFILES += $${PWD}/appimage/appimagebuild
diff --git a/scripts/package.sh b/scripts/package
similarity index 95%
rename from scripts/package.sh
rename to scripts/package
index f6e3705..f2031fc 100644
--- a/scripts/package.sh
+++ b/scripts/package
@@ -40,9 +40,9 @@ build_appimage() {
mkdir -p "${BUILDDIR}"
export_srcarchive "${BUILDDIR}/${PKGNAME}.tar.gz"
tar -xzf "${BUILDDIR}/${PKGNAME}.tar.gz" -C "${BUILDDIR}"
- cp "${PROJDIR}/pkg/appimage/appimage.sh" "${BUILDDIR}/${PKGNAME}"
+ cp "${PROJDIR}/pkg/appimage/appimagebuild" "${BUILDDIR}/${PKGNAME}"
cd "${BUILDDIR}/${PKGNAME}"
- sh appimage.sh
+ sh appimagebuild
}
export_srcarchive() {
diff --git a/scripts/prepare.sh b/scripts/prepare
similarity index 100%
rename from scripts/prepare.sh
rename to scripts/prepare
diff --git a/scripts/scripts.pri b/scripts/scripts.pri
index de6b1aa..3422cff 100644
--- a/scripts/scripts.pri
+++ b/scripts/scripts.pri
@@ -1,3 +1,3 @@
DISTFILES += \
- $${PWD}/package.sh \
- $${PWD}/prepare.sh
+ $${PWD}/package \
+ $${PWD}/prepare
--
GitLab