fix build detection, use fewer directories potentially

diff --git a/emacs b/emacs
index 30e7f6b50a3cd634146aab07c222b0bc223af472..88ecb631f7bd9050e985c9b84635baf130ac0ea8 100755 (executable)
--- a/emacs
+++ b/emacs
@@ -86,7 +86,7 @@ fi
 pi ${pkgs[@]}
 
 #git repo
-dir=/a/opt/emacs-$(distro-name)$(distro-num)
+dir=/a/opt/emacs-$(debian-codename-compat)
 last_build=$dir/iank-emacs-build
 
 # e/e because autofs failing to mount will make it so
@@ -132,6 +132,8 @@ fi
 
 if $bootstrap; then
   m rsync --exclude /.git --delete-excluded -ra /a/opt/emacs/ $dir
+  mkdir $dir.git
+  m rsync -ra /a/opt/emacs/.git/{HEAD,refs} $dir/.git
   recompile=true
 fi
 

diff --git a/mu4e b/mu4e
index 58955ec030308272ec8a868bc79100c3fb76a549..562af776fe12937d8d0c32242bd71b7225286cde 100755 (executable)
--- a/mu4e
+++ b/mu4e
@@ -43,7 +43,7 @@ done
 bootstrap=false
 
 #git repo
-dir=/a/opt/mu-$(distro-name)$(distro-num)
+dir=/a/opt/mu-$(debian-codename-compat)
 last_build=$dir/iank-mu-build
 
 if [[ -e $dir ]]; then