From 575858a3709d03b6348add5721cd02e320b424bf Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Wed, 13 Mar 2019 18:50:33 -0400 Subject: Protect against cmd operands beginning with "-" --- (limited to 'src/ob-installdocs.sh') diff --git a/src/ob-installdocs.sh b/src/ob-installdocs.sh index e594610..0b3a342 100644 --- a/src/ob-installdocs.sh +++ b/src/ob-installdocs.sh @@ -29,22 +29,22 @@ install_docs() for src in ${srcs}; do if [ -f "${src}" ]; then - if ! mkdir -p "$(dirname "${data_doc_dir}/${dest}")" + if ! mkdir -p -- "$(dirname -- "${data_doc_dir}/${dest}")" then ob_error "$(ob_get_msg 'cant_make_doc_dir')" return 1 fi - if ! cp -R "${src}" "${data_doc_dir}/${dest}"; then + if ! cp -R -- "${src}" "${data_doc_dir}/${dest}"; then ob_error "$(ob_get_msg 'cant_cp_doc_file')" "${src}" return 1 fi elif [ -d "${src}" ]; then - if ! mkdir -p "$(dirname "${data_doc_dir}/${dest}")" + if ! mkdir -p -- "$(dirname -- "${data_doc_dir}/${dest}")" then ob_error "$(ob_get_msg 'cant_make_doc_dir')" return 1 fi - if ! cp -R "${src}/." "${data_doc_dir}/${dest}"; then + if ! cp -R -- "${src}/." "${data_doc_dir}/${dest}"; then ob_error "$(ob_get_msg 'cant_cp_doc_file')" "${src}" return 1 fi @@ -80,7 +80,7 @@ main() ob_info "$(ob_get_msg 'docs_already_installed')" "${pkg}" else ob_info "$(ob_get_msg 'installing_docs')" "${pkg}" - if ! mkdir -p "${data_doc_dir}"; then + if ! mkdir -p -- "${data_doc_dir}"; then ob_error "$(ob_get_msg 'cant_make_doc_dir')" return 1 fi @@ -97,11 +97,11 @@ main() ob_info "$(ob_get_msg 'docs_already_linked')" "${pkg}" else ob_info "$(ob_get_msg 'linking_docs')" "${pkg}" - if ! mkdir -p "${data_doc_dir%/*}"; then + if ! mkdir -p -- "${data_doc_dir%/*}"; then ob_error "$(ob_get_msg 'cant_make_doc_dir')" return 1 fi - if ! ln -s "${doc_pkg_doc_dir}" \ + if ! ln -s -- "${doc_pkg_doc_dir}" \ "${data_doc_dir}"; then ob_error "$(ob_get_msg 'cant_ln_doc_dir')" return 1 -- cgit v0.9.1