From 175dd92b012c5efc4c73230bbb6778655076313e Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Sun, 18 Feb 2018 23:25:19 +0900
Subject: [PATCH] Make bash scripts executable
---
.travis.yml | 8 ++++----
pkg/archlinux/PKGBUILD | 2 +-
pkg/fedora/ocs-url.spec | 2 +-
pkg/opensuse/ocs-url.spec | 2 +-
pkg/ubuntu/debian/rules | 2 +-
scripts/package | 8 ++++----
scripts/prepare | 0
7 files changed, 12 insertions(+), 12 deletions(-)
mode change 100644 => 100755 scripts/package
mode change 100644 => 100755 scripts/prepare
diff --git a/.travis.yml b/.travis.yml
index 2ecc795..5164098 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ branches:
script:
- mntdir='/mnt/ocs-url'
- - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "sh ${mntdir}/scripts/package ci_ubuntu_deb"
- - docker run --rm -v $(pwd):${mntdir} fedora:20 /bin/bash -c "sh ${mntdir}/scripts/package ci_fedora_rpm"
- - docker run --rm -v $(pwd):${mntdir} opensuse:42.1 /bin/bash -c "sh ${mntdir}/scripts/package ci_opensuse_rpm"
- - docker run --rm -v $(pwd):${mntdir} base/archlinux:latest /bin/bash -c "sh ${mntdir}/scripts/package ci_archlinux_pkg"
+ - docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "${mntdir}/scripts/package ci_ubuntu_deb"
+ - docker run --rm -v $(pwd):${mntdir} fedora:20 /bin/bash -c "${mntdir}/scripts/package ci_fedora_rpm"
+ - docker run --rm -v $(pwd):${mntdir} opensuse:42.1 /bin/bash -c "${mntdir}/scripts/package ci_opensuse_rpm"
+ - docker run --rm -v $(pwd):${mntdir} base/archlinux:latest /bin/bash -c "${mntdir}/scripts/package ci_archlinux_pkg"
- cat transfer.log
diff --git a/pkg/archlinux/PKGBUILD b/pkg/archlinux/PKGBUILD
index 71e2592..d7cccf3 100644
--- a/pkg/archlinux/PKGBUILD
+++ b/pkg/archlinux/PKGBUILD
@@ -16,7 +16,7 @@ md5sums=() #autofill using updpkgsums
prepare() {
#cd "${pkgname}-release-${pkgver}"
cd "${pkgname}"
- sh scripts/prepare
+ ./scripts/prepare
}
build() {
diff --git a/pkg/fedora/ocs-url.spec b/pkg/fedora/ocs-url.spec
index feb1176..1e9f5ae 100644
--- a/pkg/fedora/ocs-url.spec
+++ b/pkg/fedora/ocs-url.spec
@@ -18,7 +18,7 @@ An install helper program for items served on OpenCollaborationServices (OCS).
%prep
#%%autosetup -n %{name}-release-%{version}
%autosetup -n %{name}
-sh scripts/prepare
+./scripts/prepare
%build
%define debug_package %{nil}
diff --git a/pkg/opensuse/ocs-url.spec b/pkg/opensuse/ocs-url.spec
index 13326fe..a55c7e0 100644
--- a/pkg/opensuse/ocs-url.spec
+++ b/pkg/opensuse/ocs-url.spec
@@ -18,7 +18,7 @@ An install helper program for items served on OpenCollaborationServices (OCS).
%prep
#%%autosetup -n %{name}-release-%{version}
%autosetup -n %{name}
-sh scripts/prepare
+./scripts/prepare
%build
%define debug_package %{nil}
diff --git a/pkg/ubuntu/debian/rules b/pkg/ubuntu/debian/rules
index d0e16cf..3451beb 100755
--- a/pkg/ubuntu/debian/rules
+++ b/pkg/ubuntu/debian/rules
@@ -4,7 +4,7 @@
dh $@
override_dh_auto_configure:
- sh scripts/prepare
+ ./scripts/prepare
qmake PREFIX=/usr
override_dh_auto_install:
diff --git a/scripts/package b/scripts/package
old mode 100644
new mode 100755
index 9aab1b5..377493a
--- a/scripts/package
+++ b/scripts/package
@@ -19,7 +19,7 @@ ci_ubuntu_deb() { # docker-image: ubuntu:14.04
useradd -m ${PKGUSER}
chown -R ${PKGUSER} "${PROJDIR}"
- su -c "export HOME=/home/${PKGUSER} && sh "${PKGSCRIPT}" build_ubuntu_deb" ${PKGUSER}
+ su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_ubuntu_deb" ${PKGUSER}
transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.deb")"
}
@@ -42,7 +42,7 @@ ci_fedora_rpm() { # docker-image: fedora:20
useradd -m ${PKGUSER}
chown -R ${PKGUSER} "${PROJDIR}"
- su -c "export HOME=/home/${PKGUSER} && sh "${PKGSCRIPT}" build_fedora_rpm" ${PKGUSER}
+ su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_fedora_rpm" ${PKGUSER}
transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.rpm")"
}
@@ -66,7 +66,7 @@ ci_opensuse_rpm() { # docker-image: opensuse:42.1
useradd -m ${PKGUSER}
chown -R ${PKGUSER} "${PROJDIR}"
- su -c "export HOME=/home/${PKGUSER} && sh "${PKGSCRIPT}" build_opensuse_rpm" ${PKGUSER}
+ su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_opensuse_rpm" ${PKGUSER}
transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.rpm")"
}
@@ -89,7 +89,7 @@ ci_archlinux_pkg() { # docker-image: base/archlinux:latest
useradd -m ${PKGUSER}
chown -R ${PKGUSER} "${PROJDIR}"
- su -c "export HOME=/home/${PKGUSER} && sh "${PKGSCRIPT}" build_archlinux_pkg" ${PKGUSER}
+ su -c "export HOME=/home/${PKGUSER} && "${PKGSCRIPT}" build_archlinux_pkg" ${PKGUSER}
transfer_file "$(find "${BUILDDIR}" -type f -name "${PKGNAME}*.pkg.tar.xz")"
}
diff --git a/scripts/prepare b/scripts/prepare
old mode 100644
new mode 100755
--
GitLab