Browse Source

Remove --intermediate feature

Too much confusing for an aesthetic feature
Alois Mahdal 10 years ago
parent
commit
4a435584b1
1 changed files with 3 additions and 20 deletions
  1. 3
    20
      bin/eeln.in

+ 3
- 20
bin/eeln.in View File

25
 usage() {
25
 usage() {
26
     local u
26
     local u
27
     u="[-d|--debug] [-f|--force] [-v|--verbose]"
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
     usage_is "$u"
29
     usage_is "$u"
30
 }
30
 }
31
 
31
 
32
 link() {
32
 link() {
33
     local src=$1
33
     local src=$1
34
     local dst=$2
34
     local dst=$2
35
-
36
     debug -v src dst
35
     debug -v src dst
37
-
38
     if $TRY_RELPATH;
36
     if $TRY_RELPATH;
39
     then
37
     then
40
         src=$(python <(echo "$PY_SCRIPT") "$src" "$(dirname $dst)")
38
         src=$(python <(echo "$PY_SCRIPT") "$src" "$(dirname $dst)")
41
     fi
39
     fi
42
-
43
     think "linking $src to $dst"
40
     think "linking $src to $dst"
44
-
45
     rm -f $dst
41
     rm -f $dst
46
     ln -s $src $dst
42
     ln -s $src $dst
47
 }
43
 }
61
             FORCE=true
57
             FORCE=true
62
             shift
58
             shift
63
             ;;
59
             ;;
64
-        -i|--intermediate)
65
-            intermediate=$2
66
-            shift 2
67
-            ;;
68
         -v|--verbose)
60
         -v|--verbose)
69
             FFOO_VERBOSE=true
61
             FFOO_VERBOSE=true
70
             shift
62
             shift
85
 done
77
 done
86
 
78
 
87
 test -z "$target"               && target=$(load target)
79
 test -z "$target"               && target=$(load target)
88
-test -z "$intermediate"         && intermediate=$(load intermediate)
89
 test -z "$prefix"               && prefix=$(load prefix)
80
 test -z "$prefix"               && prefix=$(load prefix)
90
 test -z "$target"               && target=$DEFAULT_TARGET
81
 test -z "$target"               && target=$DEFAULT_TARGET
91
 
82
 
96
     *)          name=$prefix.$name;;
87
     *)          name=$prefix.$name;;
97
 esac
88
 esac
98
 
89
 
99
-debug -v name intermediate target
90
+debug -v name target
100
 
91
 
101
 mkdir -p $target
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