From d9e20e6d1237e0ccd5ff9d9b3b37f530e38455de Mon Sep 17 00:00:00 2001 From: Jyri-Petteri Paloposki Date: Wed, 25 Aug 2021 20:02:04 +0300 Subject: [PATCH] Remove the Rails dependency on host by fixing the bin/ra[ke,ils] scripts to use basic sh --- bin/rails | 19 ++++++++++++------- bin/rake | 20 +++++++++++++------- bin/run-rails | 5 +++++ bin/run-rake | 5 +++++ 4 files changed, 35 insertions(+), 14 deletions(-) create mode 100755 bin/run-rails create mode 100755 bin/run-rake diff --git a/bin/rails b/bin/rails index e2afa025..cd471e11 100755 --- a/bin/rails +++ b/bin/rails @@ -1,8 +1,13 @@ -#!/usr/bin/env ruby -if File.exist?("#{__dir__}/../.use-docker") - exec("#{__dir__}/../script/docker-environment", $PROGRAM_NAME, *ARGV) unless File.exist?("/etc/app-env") -end +#!/bin/sh -APP_PATH = File.expand_path('../config/application', __dir__) -require_relative '../config/boot' -require 'rails/commands' +# Absolute path to this script, e.g. /home/user/bin/foo.sh +SCRIPT=$(readlink -f "$0") +# Absolute path this script is in, thus /home/user/bin +SCRIPTPATH=$(dirname "$SCRIPT") + +if [ -e ../.use-docker -a ! -e /etc/app-env ]; +then + $SCRIPTPATH/../script/docker-environment $0 "$@" +else + $SCRIPTPATH/run-rake "$@" +fi diff --git a/bin/rake b/bin/rake index c9e1ee4c..1dce1ede 100755 --- a/bin/rake +++ b/bin/rake @@ -1,7 +1,13 @@ -#!/usr/bin/env ruby -if File.exist?("#{__dir__}/../.use-docker") - exec("#{__dir__}/../script/docker-environment", $PROGRAM_NAME, *ARGV) unless File.exist?("/etc/app-env") -end -require_relative '../config/boot' -require 'rake' -Rake.application.run +#!/bin/sh + +# Absolute path to this script, e.g. /home/user/bin/foo.sh +SCRIPT=$(readlink -f "$0") +# Absolute path this script is in, thus /home/user/bin +SCRIPTPATH=$(dirname "$SCRIPT") + +if [ -e $SCRIPTPATH/../.use-docker -a ! -e /etc/app-env ]; +then + $SCRIPTPATH/../script/docker-environment $0 "$@" +else + $SCRIPTPATH/run-rake "$@" +fi diff --git a/bin/run-rails b/bin/run-rails new file mode 100755 index 00000000..b93066a1 --- /dev/null +++ b/bin/run-rails @@ -0,0 +1,5 @@ +#!/usr/bin/env ruby + +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/run-rake b/bin/run-rake new file mode 100755 index 00000000..8dbbadb1 --- /dev/null +++ b/bin/run-rake @@ -0,0 +1,5 @@ +#!/usr/bin/env ruby + +require_relative '../config/boot' +require 'rake' +Rake.application.run