From ed2110fe0d90653e68406bdf62b33287a41b82f4 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Thu, 06 Mar 2014 11:18:15 -0500 Subject: src/*.sh: Wrap long lines. --- diff --git a/src/oh-architecture.sh b/src/oh-architecture.sh index 13c0a6d..76bb817 100644 --- a/src/oh-architecture.sh +++ b/src/oh-architecture.sh @@ -30,13 +30,16 @@ main() while getopts 's:S:B:' opt; do case "${opt}" in s) - oh_set_buildsystem_option 'source-dir' "${OPTARG}" + oh_set_buildsystem_option 'source-dir' \ + "${OPTARG}" ;; S) - oh_set_buildsystem_option 'build-system' "${OPTARG}" + oh_set_buildsystem_option 'build-system' \ + "${OPTARG}" ;; B) - oh_set_buildsystem_option 'build-dir' "${OPTARG}" + oh_set_buildsystem_option 'build-dir' \ + "${OPTARG}" ;; ?) oh_error "$(oh_get_msg 'bad_opt')" diff --git a/src/oh-autobuild.sh b/src/oh-autobuild.sh index 1cb2355..09252a3 100644 --- a/src/oh-autobuild.sh +++ b/src/oh-autobuild.sh @@ -30,16 +30,20 @@ main() while getopts 's:S:B:T:' opt; do case "${opt}" in s) - oh_set_buildsystem_option 'source-dir' "${OPTARG}" + oh_set_buildsystem_option 'source-dir' \ + "${OPTARG}" ;; S) - oh_set_buildsystem_option 'build-system' "${OPTARG}" + oh_set_buildsystem_option 'build-system' \ + "${OPTARG}" ;; B) - oh_set_buildsystem_option 'build-dir' "${OPTARG}" + oh_set_buildsystem_option 'build-dir' \ + "${OPTARG}" ;; T) - oh_set_buildsystem_option 'build-target' "${OPTARG}" + oh_set_buildsystem_option 'build-target' \ + "${OPTARG}" ;; ?) oh_error "$(oh_get_msg 'bad_opt')" diff --git a/src/oh-autoclean.sh b/src/oh-autoclean.sh index 6efd949..433e681 100644 --- a/src/oh-autoclean.sh +++ b/src/oh-autoclean.sh @@ -30,13 +30,16 @@ main() while getopts 's:S:B:' opt; do case "${opt}" in s) - oh_set_buildsystem_option 'source-dir' "${OPTARG}" + oh_set_buildsystem_option 'source-dir' \ + "${OPTARG}" ;; S) - oh_set_buildsystem_option 'build-system' "${OPTARG}" + oh_set_buildsystem_option 'build-system' \ + "${OPTARG}" ;; B) - oh_set_buildsystem_option 'build-dir' "${OPTARG}" + oh_set_buildsystem_option 'build-dir' \ + "${OPTARG}" ;; ?) oh_error "$(oh_get_msg 'bad_opt')" diff --git a/src/oh-autoconfigure.sh b/src/oh-autoconfigure.sh index fb48515..a0e0b9c 100644 --- a/src/oh-autoconfigure.sh +++ b/src/oh-autoconfigure.sh @@ -30,16 +30,20 @@ main() while getopts 's:S:B:t:' opt; do case "${opt}" in s) - oh_set_buildsystem_option 'source-dir' "${OPTARG}" + oh_set_buildsystem_option 'source-dir' \ + "${OPTARG}" ;; S) - oh_set_buildsystem_option 'build-system' "${OPTARG}" + oh_set_buildsystem_option 'build-system' \ + "${OPTARG}" ;; B) - oh_set_buildsystem_option 'build-dir' "${OPTARG}" + oh_set_buildsystem_option 'build-dir' \ + "${OPTARG}" ;; t) - oh_set_buildsystem_option 'target-arch' "${OPTARG}" + oh_set_buildsystem_option 'target-arch' \ + "${OPTARG}" ;; ?) oh_error "$(oh_get_msg 'bad_opt')" diff --git a/src/oh-autoinstall.sh b/src/oh-autoinstall.sh index 711e481..702be80 100644 --- a/src/oh-autoinstall.sh +++ b/src/oh-autoinstall.sh @@ -30,19 +30,24 @@ main() while getopts 's:S:B:d:T:' opt; do case "${opt}" in s) - oh_set_buildsystem_option 'source-dir' "${OPTARG}" + oh_set_buildsystem_option 'source-dir' \ + "${OPTARG}" ;; S) - oh_set_buildsystem_option 'build-system' "${OPTARG}" + oh_set_buildsystem_option 'build-system' \ + "${OPTARG}" ;; B) - oh_set_buildsystem_option 'build-dir' "${OPTARG}" + oh_set_buildsystem_option 'build-dir' \ + "${OPTARG}" ;; d) - oh_set_buildsystem_option 'destdir' "${OPTARG}" + oh_set_buildsystem_option 'destdir' \ + "${OPTARG}" ;; T) - oh_set_buildsystem_option 'build-target' "${OPTARG}" + oh_set_buildsystem_option 'build-target' \ + "${OPTARG}" ;; ?) oh_error "$(oh_get_msg 'bad_opt')" diff --git a/src/oh-autotest.sh b/src/oh-autotest.sh index 34fcb56..c57e510 100644 --- a/src/oh-autotest.sh +++ b/src/oh-autotest.sh @@ -30,10 +30,12 @@ main() while getopts 'S:B:' opt; do case "${opt}" in S) - oh_set_buildsystem_option 'build-system' "${OPTARG}" + oh_set_buildsystem_option 'build-system' \ + "${OPTARG}" ;; B) - oh_set_buildsystem_option 'build-dir' "${OPTARG}" + oh_set_buildsystem_option 'build-dir' \ + "${OPTARG}" ;; ?) oh_error "$(oh_get_msg 'bad_opt')" diff --git a/src/oh-fixperms.sh b/src/oh-fixperms.sh index 42a1e74..f9ad522 100644 --- a/src/oh-fixperms.sh +++ b/src/oh-fixperms.sh @@ -44,8 +44,8 @@ main() find "${dir}" \ -exec 'chown' '-h' '0:0' '{}' ';' - # Ensure that shared libraries, static libraries, and libtool archives have - # a rw-r--r-- mode. + # Ensure that shared libraries, static libraries, and libtool archives + # have a rw-r--r-- mode. oh_info "$(oh_get_msg 'chmod_lib')" find "${dir}" -type f -a ! -perm 644 \ -a \( -name '*.so*' -o -name '*.a' -o -name '*.la' \) \ diff --git a/src/oh-installfiles.sh b/src/oh-installfiles.sh index befcd59..bd871e2 100644 --- a/src/oh-installfiles.sh +++ b/src/oh-installfiles.sh @@ -55,7 +55,8 @@ main() [ -e "${file}" -o -L "${file}" ] || continue file="${file#${dir}}" mkdir -p "${pkg}.data/${file%/?*}" - # TODO: If file, ln file. If dir, recursively mkdir and ln. + # TODO: If file, ln file. If dir, recursively + # mkdir and ln. mv "${PWD}/${dir}/${file}" "${pkg}.data/${file}" done done <"../${pkg}.pkg/files" diff --git a/src/oh-strip.sh b/src/oh-strip.sh index b104473..45dd1b8 100644 --- a/src/oh-strip.sh +++ b/src/oh-strip.sh @@ -48,7 +48,8 @@ main() find "${dir}" -type f -a ! -path '*/debug/*' -a -name '*.so*' | \ while IFS="${CR}" read file; do - if file "${file}" | grep 'ELF.*shared' >/dev/null 2>&1; then + if file "${file}" | grep 'ELF.*shared' \ + >/dev/null 2>&1; then file="${file#${dir}}" file="/${file##/}" strip_so "${file}" @@ -65,8 +66,8 @@ main() fi done - find "${dir}" -type f -a ! -path '*/debug/*' \ - -a -name 'lib*.a' -a ! -name '*_g.a' | while IFS="{CR}" read file; do + find "${dir}" -type f -a ! -path '*/debug/*' -a -name 'lib*.a' \ + -a ! -name '*_g.a' | while IFS="{CR}" read file; do file="${file#${dir}}" file="/${file##/}" strip_a "${file}" @@ -130,8 +131,8 @@ keep_debug() return fi - build_id_parts="$(${READELF} -n "${dir}/${file}" | \ - sed -n 's/^.*Build ID: \([0-9a-f][0-9a-f]\)\([0-9a-f]*\)$/\1 \2/p')" + build_id_parts="$(${READELF} -n "${dir}/${file}" | sed -n \ + 's/^.*Build ID: \([0-9a-f][0-9a-f]\)\([0-9a-f]*\)$/\1 \2/p')" if [ -z "${build_id_parts}" ]; then return fi -- cgit v0.9.1