From d68d8c061b70ff4fb1d5d1b491203a46311c2adb Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Sun, 18 Feb 2018 23:39:22 +0900
Subject: [PATCH] Make bash scripts executable
---
.travis.yml | 2 +-
pkg/appimage/appimagebuild | 2 +-
scripts/package | 4 ++--
scripts/prepare | 0
4 files changed, 4 insertions(+), 4 deletions(-)
mode change 100644 => 100755 pkg/appimage/appimagebuild
mode change 100644 => 100755 scripts/package
mode change 100644 => 100755 scripts/prepare
diff --git a/.travis.yml b/.travis.yml
index 00353ed..87a1032 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 ci_appimage"
+ - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "${mntdir}/scripts/package ci_appimage"
- cat transfer.log
diff --git a/pkg/appimage/appimagebuild b/pkg/appimage/appimagebuild
old mode 100644
new mode 100755
index 70d5f1b..d9e03a9
--- a/pkg/appimage/appimagebuild
+++ b/pkg/appimage/appimagebuild
@@ -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
+./scripts/prepare
qmake PREFIX=/usr
make
make INSTALL_ROOT="${PKGNAME}.AppDir" install
diff --git a/scripts/package b/scripts/package
old mode 100644
new mode 100755
index f2031fc..7038fc4
--- a/scripts/package
+++ b/scripts/package
@@ -30,7 +30,7 @@ ci_appimage() { # docker-image: ubuntu:14.04
useradd -m ${PKGUSER}
chown -R ${PKGUSER} "${PROJDIR}"
- su -c "export HOME=/home/${PKGUSER} && source /opt/qt59/bin/qt59-env.sh && sh "${PKGSCRIPT}" build_appimage" ${PKGUSER}
+ su -c "export HOME=/home/${PKGUSER} && source /opt/qt59/bin/qt59-env.sh && "${PKGSCRIPT}" build_appimage" ${PKGUSER}
transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.AppImage")"
}
@@ -42,7 +42,7 @@ build_appimage() {
tar -xzf "${BUILDDIR}/${PKGNAME}.tar.gz" -C "${BUILDDIR}"
cp "${PROJDIR}/pkg/appimage/appimagebuild" "${BUILDDIR}/${PKGNAME}"
cd "${BUILDDIR}/${PKGNAME}"
- sh appimagebuild
+ ./appimagebuild
}
export_srcarchive() {
diff --git a/scripts/prepare b/scripts/prepare
old mode 100644
new mode 100755
--
GitLab