Commits

Peter Szilagyi committed 51858a0

bin/install.sh: sink fixed

Comments (0)

Files changed (1)

 # machines.  The offices are four: nyc, ldn, hkg, and tot.
 offices="hkg ldn nyc tot"
 host_hkg=hkg-qws-r02
-host_ldn=ldn-qws-r01
+host_ldn=ldn-qws-r02
 host_nyc=nyc-qws-147            # nyc-qws-r04 still off after Sandy
 host_tot=tot-qws-r02
 
     -name '*.cm[xit]' -o \
     -name 'doit.exe' \) -print0 | xargs -r0tn1 rm
 
-temp=$(mktemp -d)
-trap 'rm -r "$temp"' 0
-jane_elisp=$temp/jane-elisp
-
 set -x
 
 # This should be run from a functioning, built checkout, where the
 test -x "$dot/"../ocaml/omake/exe/omake_server.exe
 test -x "$dot/"ocp-indent
 
-ln -sf $(cd "$dot/".. && pwd) "$jane_elisp"
 for office in $offices
 do
     eval host=\$host_$office
-    #ssh "$host" "mkdir -p '$target'"
-
-    # "sink deploy dir" doesn't work with weird directory names like
-    # "bin/.." (yet) and doesn't rename directories as it installs
-    # them (instead, the target is a directory into which to install,
-    # not a new name).
-    #
-    #sink deploy dir "$dot/".. "$host:$target/jane-elisp" -message "$message"
-    sink deploy dir "$jane_elisp" "$host:$target" -message "$message"
+    sink deploy dir "$dot/"../ "$host:$target/jane-elisp" -message "$message"
 
     # Make all the installed files read-only so I don't accidentally
     # edit them in-place.  I could, alternatively, do a complete