diff options
| -rw-r--r-- | lib/util.sh | 31 | ||||
| -rw-r--r-- | src/oh-applypatches.sh | 1 | ||||
| -rw-r--r-- | src/oh-copyconfig.sh | 1 | ||||
| -rw-r--r-- | src/oh-parsechangelog.sh | 1 | ||||
| -rw-r--r-- | src/oh-unpacksource.sh | 1 | ||||
| -rw-r--r-- | src/opkbuild.sh | 3 |
6 files changed, 38 insertions, 0 deletions
diff --git a/lib/util.sh b/lib/util.sh new file mode 100644 index 0000000..21d0d80 --- /dev/null +++ b/lib/util.sh @@ -0,0 +1,31 @@ +#!@@SHELL@@ +# +# opkhelper +# lib/util +# Common functions for utilities. +# +# Copyright (C) 2012 Patrick "P. J." McDermott +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +[ -n "${_OH_UTIL_SH}" ] && return 0 +_OH_UTIL_SH=true + +# Global parameters: +OH_SOURCE_DIR=. + +oh_set_source_dir() +{ + OH_SOURCE_DIR="${1}" +} diff --git a/src/oh-applypatches.sh b/src/oh-applypatches.sh index 637c1d0..65e272d 100644 --- a/src/oh-applypatches.sh +++ b/src/oh-applypatches.sh @@ -25,6 +25,7 @@ main() { oh_locale_set + oh_set_source_dir .. if [ "${#}" -ne 0 ]; then oh_usage diff --git a/src/oh-copyconfig.sh b/src/oh-copyconfig.sh index 9d6e645..1371115 100644 --- a/src/oh-copyconfig.sh +++ b/src/oh-copyconfig.sh @@ -25,6 +25,7 @@ main() { oh_locale_set + oh_set_source_dir .. if [ "${#}" -ne 0 ]; then oh_usage diff --git a/src/oh-parsechangelog.sh b/src/oh-parsechangelog.sh index 9935d8b..766a872 100644 --- a/src/oh-parsechangelog.sh +++ b/src/oh-parsechangelog.sh @@ -26,6 +26,7 @@ main() { oh_locale_set + oh_set_source_dir .. if [ "${#}" -ne 0 ]; then oh_usage diff --git a/src/oh-unpacksource.sh b/src/oh-unpacksource.sh index eb48aed..72666ce 100644 --- a/src/oh-unpacksource.sh +++ b/src/oh-unpacksource.sh @@ -31,6 +31,7 @@ UPSTREAM_ARCHIVE_DIR= main() { oh_locale_set + oh_set_source_dir .. if [ "${#}" -ne 0 ]; then oh_usage diff --git a/src/opkbuild.sh b/src/opkbuild.sh index 94c12e8..ff374d4 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -67,6 +67,7 @@ OPT_UID0_CMD= main() { oh_locale_set + oh_set_source_dir . get_options if [ "${#}" -ne 0 ]; then @@ -349,6 +350,8 @@ make_work_area() mkdir tmp || oh_error "${oh_str_cant_make_work_area}" cd tmp || oh_error "${oh_str_cant_enter_work_area}" + oh_set_source_dir .. + step_unpack } |