From 89f6db8c2232b543aaebfe1ba8d9ba8d3a7fc177 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Thu, 12 Sep 2019 01:12:18 +0200 Subject: Adjust pre-existing script to use the new common.sourced.sh Change-Id: Icf7829d3499110a76b90679ba2d067f80d189e69 Reviewed-by: Heikki Halmet --- coin/provisioning/common/macos/increase_limits.sh | 18 ++++----- .../qtci-macos-10.12-x86_64/01-increase_limits.sh | 45 +--------------------- .../qtci-macos-10.13-x86_64/01-increase_limits.sh | 45 +--------------------- .../qtci-macos-10.14-x86_64/01-increase_limits.sh | 45 +--------------------- 4 files changed, 14 insertions(+), 139 deletions(-) diff --git a/coin/provisioning/common/macos/increase_limits.sh b/coin/provisioning/common/macos/increase_limits.sh index 666d9067..040c55e8 100755 --- a/coin/provisioning/common/macos/increase_limits.sh +++ b/coin/provisioning/common/macos/increase_limits.sh @@ -39,22 +39,20 @@ # and they sometimes create problems to the build process and telegraf. -# Must have this variable set in the environment -[ x"$PROVISION_DIR" = x ] && exit 38 +set -e + +PROVISIONING_DIR="$(dirname "$0")/../../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh echo "Current limits are:" ulimit -a launchctl limit -sudo cp $PROVISION_DIR/common/macos/limit.maxfiles.plist /Library/LaunchDaemons/ -sudo cp $PROVISION_DIR/common/macos/limit.maxproc.plist /Library/LaunchDaemons/ - -sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist -sudo chown root:wheel /Library/LaunchDaemons/limit.maxproc.plist - -sudo chmod 644 /Library/LaunchDaemons/limit.maxfiles.plist -sudo chmod 644 /Library/LaunchDaemons/limit.maxproc.plist +$CMD_INSTALL -m 644 -o root -g wheel \ + $PROVISIONING_DIR/common/macos/limit.maxfiles.plist \ + $PROVISIONING_DIR/common/macos/limit.maxproc.plist \ + /Library/LaunchDaemons/ # Activate the new limits immediately (not for the current session though) sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh index c7bf7a88..08669e52 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh @@ -1,44 +1,3 @@ -#!/usr/bin/env bash +#!/bin/sh -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - - -set -ex - - -PROVISION_DIR="$(dirname "$0")/.." -export PROVISION_DIR - - -. "$PROVISION_DIR"/common/macos/increase_limits.sh +"$(dirname "$0")"/../common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh index c7bf7a88..08669e52 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh @@ -1,44 +1,3 @@ -#!/usr/bin/env bash +#!/bin/sh -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - - -set -ex - - -PROVISION_DIR="$(dirname "$0")/.." -export PROVISION_DIR - - -. "$PROVISION_DIR"/common/macos/increase_limits.sh +"$(dirname "$0")"/../common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh index c7bf7a88..08669e52 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh @@ -1,44 +1,3 @@ -#!/usr/bin/env bash +#!/bin/sh -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - - -set -ex - - -PROVISION_DIR="$(dirname "$0")/.." -export PROVISION_DIR - - -. "$PROVISION_DIR"/common/macos/increase_limits.sh +"$(dirname "$0")"/../common/macos/increase_limits.sh -- cgit v1.2.3