From a22ff75e023034068d07adae2ebc427607b24b5d Mon Sep 17 00:00:00 2001 From: Einhard Leichtfuß Date: Sun, 23 Dec 2018 07:06:00 +0100 Subject: Simplify and abstract from "$tmp" - Add input and write to basic.sh to no longer need to know "$tmp" in the calling scripts. Also, - make runnable from outside the directory containing the scripts, - simplify chained grep and sed commands. --- make_install.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'make_install.sh') diff --git a/make_install.sh b/make_install.sh index 0a3098c..6a3468d 100755 --- a/make_install.sh +++ b/make_install.sh @@ -20,7 +20,10 @@ # along with aur-fd-scripts. If not, see . # -. basic.sh +script_path="$(realpath "$0")" +script_dir="${script_path%/*}" +. "${script_dir}/basic.sh" + function main { @@ -54,14 +57,16 @@ function main fi } + function make_install { pkgname=dict-freedict-${lang}${ext} - cp ../sample.install "$tmp" + input ../sample.install replace "%LANG%" "$lang" replace "%SUFFIX%" "$ext" - mv "$tmp" ${pkgname}/${pkgname}.install + write ${pkgname}/${pkgname}.install } + main "$@" -- cgit v1.2.3