diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-09-06 19:48:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-09-06 19:48:01 +0300 |
| commit | 3bf1fe248c844c99a1c3e8f6cb16ac4b7dacadca (patch) | |
| tree | c40727fff76f80c1eed8c025bb2a79188a19f8a2 | |
| parent | 2953f358edbfa6d339776f3c0d8794920869c675 (diff) | |
| download | spm-3bf1fe248c844c99a1c3e8f6cb16ac4b7dacadca.tar.gz spm-3bf1fe248c844c99a1c3e8f6cb16ac4b7dacadca.tar.bz2 spm-3bf1fe248c844c99a1c3e8f6cb16ac4b7dacadca.tar.xz spm-3bf1fe248c844c99a1c3e8f6cb16ac4b7dacadca.zip | |
Fix escaped configure and init commands in scripts.
| -rw-r--r-- | scripts/include/common.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/include/common.sh b/scripts/include/common.sh index 4fcb426..929bc7a 100644 --- a/scripts/include/common.sh +++ b/scripts/include/common.sh @@ -126,8 +126,8 @@ function run_autoreconf { function run_src_script { cd "${srcdir}" check_error $? - echo $* - $* + echo $@ + $@ check_error $? } @@ -146,7 +146,7 @@ function run_configure { cd "${builddir}" check_error $? echo "configure --prefix=\"${bindir}\" ${flags}" - "$srcdir"/configure --prefix="${bindir}" ${flags} + eval "$srcdir"/configure --prefix="${bindir}" ${flags} check_error $? unset flags } @@ -159,7 +159,7 @@ function run_cmake { cd "${builddir}" check_error $? echo "cmake -DCMAKE_INSTALL_PREFIX:PATH=\"${bindir}\" \"$srcdir\" ${flags}" - cmake -DCMAKE_INSTALL_PREFIX:PATH="${bindir}" "$srcdir" ${flags} + eval cmake -DCMAKE_INSTALL_PREFIX:PATH="${bindir}" "$srcdir" ${flags} check_error $? unset flags } @@ -405,7 +405,7 @@ function package_build { run_enable_same_dir_build fi if [[ "$SRC_INIT_COMMAND" != "" ]]; then - run_src_script "$SRC_INIT_COMMAND" + eval run_src_script "$SRC_INIT_COMMAND" fi case "$BUILD_TYPE" in |