diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-06-03 21:16:57 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-06-03 21:16:57 (EDT) |
| commit | 1a99f365a5435326d8efc5779e79a5e8cb0bc7b5 (patch) | |
| tree | 63570fefa969a20ef9058e2838ba41fa05d31d8e | |
| parent | a11ee7117201ad8993671f33a2e2c990b15965ea (diff) | |
Fix all instance of opt_uid0_cmd.
| -rw-r--r-- | patches/03_separate-opt_uid0_cmd-non-option-args.patch | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/patches/03_separate-opt_uid0_cmd-non-option-args.patch b/patches/03_separate-opt_uid0_cmd-non-option-args.patch index f491acb..b3f847d 100644 --- a/patches/03_separate-opt_uid0_cmd-non-option-args.patch +++ b/patches/03_separate-opt_uid0_cmd-non-option-args.patch @@ -4,7 +4,7 @@ Description: Separate opt_uid0_cmd non-option arguments diff -Naur src.orig/src/opkbuild.sh src/src/opkbuild.sh --- src.orig/src/opkbuild.sh 2012-11-15 14:55:57.000000000 -0500 -+++ src/src/opkbuild.sh 2013-06-03 20:46:14.235239682 -0400 ++++ src/src/opkbuild.sh 2013-06-03 21:15:47.625478555 -0400 @@ -193,7 +193,7 @@ test_uid0_cmd() { @@ -14,3 +14,39 @@ diff -Naur src.orig/src/opkbuild.sh src/src/opkbuild.sh if [ ${?} -ne 0 ]; then ob_error "$(ob_get_msg 'uid0_cmd_not_found')" "${opt_uid0_cmd}" +@@ -263,7 +263,7 @@ + src_pkg_data_base="src-${src}.data$(ob_get_system_path 'package-source' \ + "${src}" "${ver}")" + +- "${opt_uid0_cmd}" mkdir -p \ ++ "${opt_uid0_cmd}" -- mkdir -p \ + "${src_pkg_data_base}" || \ + ob_error "$(ob_get_msg 'cant_make_src_pkg_dir')" + +@@ -272,7 +272,7 @@ + ../tmp) + ;; + ../*) +- "${opt_uid0_cmd}" cp -R "${file}" "${src_pkg_data_base}" || \ ++ "${opt_uid0_cmd}" -- cp -R "${file}" "${src_pkg_data_base}" || \ + ob_error "$(ob_get_msg 'cant_install_src_pkg_file')" + ;; + esac +@@ -328,7 +328,7 @@ + case "${opt_target}" in + '') + ../build build +- ${opt_uid0_cmd} sh -s <<-EOF ++ ${opt_uid0_cmd} -- sh -s <<-EOF + ../build install && \ + '@@BINDIR@@/ob-installdocs' && \ + '@@BINDIR@@/ob-gencontrol' && \ +@@ -339,7 +339,7 @@ + fi + ;; + 'install'|'install-'*) +- if ! ${opt_uid0_cmd} ../build "${opt_target}"; then ++ if ! ${opt_uid0_cmd} -- ../build "${opt_target}"; then + exit 1 + fi + ;; |