|
@@ -25,23 +25,19 @@ else:
|
25
|
25
|
usage() {
|
26
|
26
|
local u
|
27
|
27
|
u="[-d|--debug] [-f|--force] [-v|--verbose]"
|
28
|
|
- u="$u [-i|--intermediate] [-t|--target TARGET] SOURCE [NAME]"
|
|
28
|
+ u="$u [-t|--target TARGET] SOURCE [NAME]"
|
29
|
29
|
usage_is "$u"
|
30
|
30
|
}
|
31
|
31
|
|
32
|
32
|
link() {
|
33
|
33
|
local src=$1
|
34
|
34
|
local dst=$2
|
35
|
|
-
|
36
|
35
|
debug -v src dst
|
37
|
|
-
|
38
|
36
|
if $TRY_RELPATH;
|
39
|
37
|
then
|
40
|
38
|
src=$(python <(echo "$PY_SCRIPT") "$src" "$(dirname $dst)")
|
41
|
39
|
fi
|
42
|
|
-
|
43
|
40
|
think "linking $src to $dst"
|
44
|
|
-
|
45
|
41
|
rm -f $dst
|
46
|
42
|
ln -s $src $dst
|
47
|
43
|
}
|
|
@@ -61,10 +57,6 @@ do
|
61
|
57
|
FORCE=true
|
62
|
58
|
shift
|
63
|
59
|
;;
|
64
|
|
- -i|--intermediate)
|
65
|
|
- intermediate=$2
|
66
|
|
- shift 2
|
67
|
|
- ;;
|
68
|
60
|
-v|--verbose)
|
69
|
61
|
FFOO_VERBOSE=true
|
70
|
62
|
shift
|
|
@@ -85,7 +77,6 @@ do
|
85
|
77
|
done
|
86
|
78
|
|
87
|
79
|
test -z "$target" && target=$(load target)
|
88
|
|
-test -z "$intermediate" && intermediate=$(load intermediate)
|
89
|
80
|
test -z "$prefix" && prefix=$(load prefix)
|
90
|
81
|
test -z "$target" && target=$DEFAULT_TARGET
|
91
|
82
|
|
|
@@ -96,15 +87,7 @@ case $prefix.$name in
|
96
|
87
|
*) name=$prefix.$name;;
|
97
|
88
|
esac
|
98
|
89
|
|
99
|
|
-debug -v name intermediate target
|
|
90
|
+debug -v name target
|
100
|
91
|
|
101
|
92
|
mkdir -p $target
|
102
|
|
-
|
103
|
|
-if test -n "$intermediate";
|
104
|
|
-then
|
105
|
|
- mkdir -p $intermediate
|
106
|
|
- link $src $intermediate/$name
|
107
|
|
- link $intermediate/$name $target/$name
|
108
|
|
-else
|
109
|
|
- link $src $target/$name
|
110
|
|
-fi
|
|
93
|
+link $src $target/$name
|