From 147a327f8a302d327f149509304c5e9a895ae93e Mon Sep 17 00:00:00 2001 From: Anton Bobov Date: Mon, 17 Oct 2011 17:02:08 +0600 Subject: f --- create_links.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'create_links.sh') diff --git a/create_links.sh b/create_links.sh index 6c2ab08..00a341a 100755 --- a/create_links.sh +++ b/create_links.sh @@ -4,15 +4,15 @@ set -e dir="$(cd "$(dirname "$0")" && pwd)" -os=$(uname -o) +os=$(uname --operating-system) ignore="$dir/ignore-$(/bin/hostname)" filter() { - fname="$(basename "$@")" - if [[ "$fname" == "." || "$fname" == ".." ]] ; then + fname="files/$(basename "$@")" + if [[ "$fname" == "files/." || "$fname" == "files/.." ]] ; then return 0 fi - return $(grep -x -F "$fname" "$ignore" >/dev/null 2>&1) + return $(grep --line-regexp --fixed-strings "$fname" "$ignore" >/dev/null 2>&1) } create_windows_link() @@ -20,9 +20,9 @@ create_windows_link() target=$target/$(basename "$link") rm -rvf "$target" if [ -d "$link" ] ; then - cmd /c mklink /D $(cygpath -w "$target") $(cygpath -w "$link") + cmd /c mklink /D $(cygpath --windows "$target") $(cygpath --windows "$link") else - cmd /c mklink $(cygpath -w "$target") $(cygpath -w "$link") + cmd /c mklink $(cygpath --windows "$target") $(cygpath --windows "$link") fi } -- cgit v1.2.3