X-Git-Url: https://iankelling.org/git/?p=buildscripts;a=blobdiff_plain;f=emacs;h=b2c97406a9c12f44c032806cbf2a5116fa70555a;hp=f4444f8e1d8acc81f0e286c249c0dc81300f6b58;hb=HEAD;hpb=2734f99556feff8f8861a193d77c438ac9b8aa11 diff --git a/emacs b/emacs index f4444f8..5fe4e2f 100755 --- a/emacs +++ b/emacs @@ -1,5 +1,12 @@ #!/bin/bash -# Copyright (C) 2016 Ian Kelling +# I, Ian Kelling, follow the GNU license recommendations at +# https://www.gnu.org/licenses/license-recommendations.en.html. They +# recommend that small programs, < 300 lines, be licensed under the +# Apache License 2.0. This file contains or is part of one or more small +# programs. If a small program grows beyond 300 lines, I plan to switch +# its license to GPL. + +# Copyright 2024 Ian Kelling # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,6 +20,7 @@ # See the License for the specific language governing permissions and # limitations under the License. + if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi #set -x @@ -104,8 +112,15 @@ if [[ -e $dir ]]; then rev=$(cat $last_build 2>/dev/null) ||: head=$(git rev-parse HEAD) if ! $recompile && ! $bootstrap && [[ $rev == "$head" ]]; then - echo "already compiled, exiting" - exit 0 + echo "already compiled" + installed_info=$(file $(readlink -f $(type -P emacs))) + build_info=$(file $dir/src/emacs) + if [[ $installed_info == "$build_info" ]]; then + echo "already installed exiting" + # this isn't perfect, because install could partially fail or the + # command after it could + exit 0 + fi fi if [[ $rev != "$head" ]]; then bootstrap=true