aboutsummaryrefslogtreecommitdiff
path: root/create_links.sh
diff options
context:
space:
mode:
Diffstat (limited to 'create_links.sh')
-rwxr-xr-xcreate_links.sh12
1 files changed, 6 insertions, 6 deletions
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
}