X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=emacs;h=142a9800871b62693914b9bd7fdaeaef8215c66f;hb=HEAD;hp=5fe4e2f4222a3e414aefa80d5385c58084d1501c;hpb=ab99d27ca3f4bc8053fe2ae8684966896e0a1186;p=buildscripts

diff --git a/emacs b/emacs
index 5fe4e2f..5770bbd 100755
--- a/emacs
+++ b/emacs
@@ -57,12 +57,10 @@ pupdate
 ver=$(apt-cache showsrc emacs | sed -rn 's/^Version: 1:([0-9]+).*/\1/p' | sort -n | tail -n1) ||:
 for x in {35..25} ""; do
   if [[ $ver ]] && (( ver >= x )); then
-    echo latest_emacs=emacs
     latest_emacs=emacs
     break
   fi
   if apt-cache showsrc emacs$x 2>/dev/null |grep . &>/dev/null; then
-    echo latest_emacs=$x
     latest_emacs=emacs$x
     break
   fi
@@ -81,7 +79,7 @@ if $show_pkgs; then
     if ! type -p apt-rdepends &>/dev/null; then
       sudo apt-get -y install --purge --auto-remove apt-rdepends
     fi
-    apt-rdepends -p --build-depends --follow=DEPENDS $x/$(debian-codename)|sed -rn 's/^\s*Build-Depends: (\S+).*/\1/p'
+    apt-rdepends -p --build-depends --follow=DEPENDS $x/$(debian-codename) 2>/dev/null |sed -rn 's/^\s*Build-Depends: (\S+).*/\1/p'
   done
   exit 0
 fi
@@ -113,8 +111,8 @@ if [[ -e $dir ]]; then
   head=$(git rev-parse HEAD)
   if ! $recompile && ! $bootstrap && [[ $rev == "$head" ]]; then
     echo "already compiled"
-    installed_info=$(file $(readlink -f $(type -P emacs)))
-    build_info=$(file $dir/src/emacs)
+    installed_info=$(file -b $(readlink -f $(type -P emacs)))
+    build_info=$(file -b $dir/src/emacs)
     if [[ $installed_info == "$build_info" ]]; then
       echo "already installed exiting"
       # this isn't perfect, because install could partially fail or the
@@ -136,7 +134,7 @@ if $dryrun; then
 fi
 
 if $bootstrap; then
-  m rsync --delete -ra /a/opt/emacs/ $dir
+  m rsync --exclude /.git --delete-excluded -ra /a/opt/emacs/ $dir
   recompile=true
 fi
 
@@ -147,7 +145,7 @@ case $(distro-name) in
     ;;&
   debian|ubuntu|trisquel)
     # todo: unknown for other distros, this will fail
-    logq p -y build-dep maildir-utils
+    logq p -y build-dep maildir-utils/$(debian-archive)
     # oddly, on ubuntu 14.04 this installs postfix, but I dun care
     # ubuntu 14.04 gave this error message
     # Unable to satisfy the build-depends: Build-Depends: libpng-dev
@@ -156,7 +154,7 @@ case $(distro-name) in
     #
     # note, useful command to see build dep packagages:
     # apt-rdepends --build-depends --follow=DEPENDS emacs25
-    logq p -y build-dep $latest_emacs
+    logq p -y build-dep $latest_emacs/$(debian-archive)
     ;;&
 esac