From 48ae42f87e82f26e696ba62c1f4de82d90949522 Mon Sep 17 00:00:00 2001 From: Peter Wortmann Date: Mon, 23 Feb 2015 11:40:06 +0100 Subject: [PATCH] Hard-code line endings of shell scripts to LF No idea whether this is the right way to do this. --- .gitattributes | 3 +++ tools/osx_bundle_libs | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index c16855571..d27c1276b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,6 @@ .git_archival export-subst .gitattributes export-ignore .gitignore export-ignore + +*.sh text eol=lf +tools/osx_bundle_libs text eol=lf diff --git a/tools/osx_bundle_libs b/tools/osx_bundle_libs index 0710760d4..548a48826 100755 --- a/tools/osx_bundle_libs +++ b/tools/osx_bundle_libs @@ -48,7 +48,7 @@ bundle_dependencies() { echo "Cannot find ${_library_name}." >&2 exit 1 fi - + _base="$(basename "${_library_name}")" _bundle_path="${_frameworks_folder_path}/${_base}" @@ -70,7 +70,7 @@ bundle_dependencies() { echo "Bundling '${_library_path}' as '${_base}'..." cp "${_library_path}" "${_bundle_path}" chmod u+w "${_bundle_path}" - + # Set a new install name for this dylib "${_install_name_tool}" -id "${_id}" "${_bundle_path}"