]> gitweb.factorcode.org Git - factor.git/blobdiff - build.sh
io.streams.tee: more tests
[factor.git] / build.sh
index 4b47ca940f232abdfb8c644e4b4e972dee7af0cb..f8a3c5090f7bf9cc53a7be59dd5f23b9e0c15735 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -7,68 +7,57 @@ set +e
 shopt -s nocaseglob
 #shopt -s nocasematch
 
-ECHO=echo
+ECHO="echo"
 OS=
 ARCH=
 WORD=
-GIT_PROTOCOL=${GIT_PROTOCOL:="git"}
-GIT_URL=${GIT_URL:=$GIT_PROTOCOL"://factorcode.org/git/factor.git"}
-SCRIPT_ARGS="$*"
+GIT_PROTOCOL=${GIT_PROTOCOL:="https"}
+GIT_URL=${GIT_URL:=$GIT_PROTOCOL"://github.com/factor/factor.git"}
 
-REQUIRE_CLANG_VERSION=3.1
-
-# return 1 on found
 test_program_installed() {
-    if ! [[ -n $(type -p $1) ]] ; then
-        return 0;
-    fi
-    return 1;
+    command -v "$1" >/dev/null 2>&1
 }
 
 # return 1 on found
 test_programs_installed() {
-    local installed=0;
+    local installed=0
     $ECHO -n "Checking for all($*)..."
-    for i in "$@" ;
+    for cmd in "$@" ;
     do
-        test_program_installed $i
-        if [[ $? -eq 1 ]]; then
-            installed=$(( $installed + 1 ))
+        if test_program_installed "$cmd"; then
+            ((installed++))
         fi
     done
     if [[ $installed -eq $# ]] ; then
         $ECHO "found!"
-        return 1
-    else
-        $ECHO "all not found."
         return 0
     fi
+    return 1
 }
 
 exit_script() {
     if [[ $FIND_MAKE_TARGET = true ]] ; then
-        # Must be echo not $ECHO
-        echo $MAKE_TARGET;
+        # not $ECHO here
+        echo "$MAKE_TARGET"
     fi
-    exit $1
+    exit "$1"
 }
 
 ensure_program_installed() {
-    local installed=0;
+    local installed=0
     $ECHO -n "Checking for any($*)..."
-    for i in "$@" ;
+    for cmd in "$@" ;
     do
-        test_program_installed $i
-        if [[ $? -eq 1 ]]; then
-            $ECHO "found $i!"
-            installed=$(( $installed + 1 ))
+        if test_program_installed "$cmd"; then
+            $ECHO "found $cmd!"
+            ((installed++))
             return
         fi
     done
     $ECHO "none found."
     $ECHO -n "Install "
     if [[ $# -eq 1 ]] ; then
-        $ECHO -n $1
+        $ECHO -n "$1"
     else
         $ECHO -n "any of [ $* ]"
     fi
@@ -78,27 +67,56 @@ ensure_program_installed() {
         $ECHO "Command Line Tools from Xcode Preferences > Downloads in order"
         $ECHO "to build Factor."
     fi
-    exit_script 1;
+    exit_script 1
 }
 
 check_ret() {
+    # Can't execute any commands before saving $?
+    # $1 is the name of the command we are checking
     RET=$?
     if [[ $RET -ne 0 ]] ; then
-       $ECHO $1 failed
+       $ECHO "$1" failed
        exit_script 2
     fi
 }
 
+download_with_wget() {
+    local url="$1"
+    local filename
+    filename=$(basename "$url")
+    $ECHO filename is "$filename"
+    $ECHO wget -nd --prefer-family=IPv4 -O "$filename" "$url"
+    wget -nd --prefer-family=IPv4 -O "$filename" "$url"
+}
+
+download_with_curl() {
+    local url="$1"
+    local filename
+    filename=$(basename "$url")
+    curl -L -f -o "$filename" "$url"
+}
+
+download_with_downloader() {
+    local url="$1"
+    if [[ -z $DOWNLOADER_NAME ]] ; then
+        set_downloader
+    fi
+    if [[ $DOWNLOADER_NAME == 'wget' ]]; then
+        download_with_wget "$url"
+    elif [[ $DOWNLOADER_NAME == 'curl' ]]; then
+        download_with_curl "$url"
+    else
+        $ECHO "error: wget or curl required in download_with_downloader"
+        exit_script 12
+    fi
+}
+
 set_downloader() {
-    test_program_installed wget
-    if [[ $? -ne 0 ]] ; then
-        DOWNLOADER=wget
+    if test_program_installed wget; then
         DOWNLOADER_NAME=wget
         return
     fi
-    test_program_installed curl
-    if [[ $? -ne 0 ]] ; then
-        DOWNLOADER="curl -f -O"
+    if test_program_installed curl; then
         DOWNLOADER_NAME=curl
         return
     fi
@@ -107,62 +125,40 @@ set_downloader() {
 }
 
 set_md5sum() {
-    test_program_installed md5sum
-    if [[ $? -ne 0 ]] ; then
+    if test_program_installed md5sum; then
         MD5SUM=md5sum
     else
         MD5SUM="md5 -r"
     fi
 }
 
-semver_into() {
-    RE_SEMVER="^([0-9]*)\.([0-9]*)\.([0-9]*)-?(.*)?$" # 3.3.3-5
-    CLANG_RE_OLD="^([0-9]*)\.([0-9]*)-?(.*)?$" # 3.3-5
-    if [[ $1 =~ $RE_SEMVER ]] ; then
-        export "$2=${BASH_REMATCH[1]}"
-        export "$3=${BASH_REMATCH[2]}"
-        export "$4=${BASH_REMATCH[3]}"
-        export "$5=${BASH_REMATCH[4]}"
-    elif [[ $1 =~ $CLANG_RE_OLD ]] ; then
-        export "$2=${BASH_REMATCH[1]}"
-        export "$3=${BASH_REMATCH[2]}"
-        export "$4=0"
-        export "$5=${BASH_REMATCH[3]}"
-    else
-        echo "unsupported version number, please report a bug: $1"
-        exit 123
-    fi
-}
+set_cc() {
+    # on Cygwin we MUST use the MinGW "cross-compiler", therefore check these first
+    # furthermore, we prefer 64 bit over 32 bit versions if both are available
+
+    # we need this condition so we don't find a mingw32 compiler on linux
+    if [[ $OS == windows ]] ; then
+        if test_programs_installed x86_64-w64-mingw32-gcc x86_64-w64-mingw32-g++; then
+            [ -z "$CC" ] && CC=x86_64-w64-mingw32-gcc
+            [ -z "$CXX" ] && CXX=x86_64-w64-mingw32-g++
+            return
+        fi
 
-clang_version_ok() {
-    CLANG_VERSION=$(clang --version | head -n1)
-    CLANG_VERSION_RE='^[a-zA-Z0-9 ]* version (.*)$' # 3.3-5
-    if [[ $CLANG_VERSION =~ $CLANG_VERSION_RE ]] ; then
-        export "CLANG_VERSION=${BASH_REMATCH[1]}"
-        local CLANG_MAJOR CLANG_MINOR CLANG_PATCH CLANG_SPECIAL
-        semver_into "$CLANG_VERSION" CLANG_MAJOR CLANG_MINOR CLANG_PATCH CLANG_SPECIAL
-        if [[ $CLANG_MAJOR -lt 3
-            || ( $CLANG_MAJOR -eq 3 && $CLANG_MINOR -le 1 )
-            ]] ; then
-            echo "clang version required >= $REQUIRE_CLANG_VERSION, got $CLANG_VERSION"
-            return 1
+        if test_programs_installed i686-w64-mingw32-gcc i686-w64-mingw32-g++; then
+            [ -z "$CC" ] && CC=i686-w64-mingw32-gcc
+            [ -z "$CXX" ] && CXX=i686-w64-mingw32-g++
+            return
         fi
-    else
-        return 1
     fi
-    return 0
-}
 
-set_cc() {
-    test_programs_installed clang clang++
-    if [[ $? -ne 0 ]] && clang_version_ok ; then
+    if test_programs_installed clang clang++ ; then
         [ -z "$CC" ] && CC=clang
         [ -z "$CXX" ] && CXX=clang++
         return
     fi
 
-    test_programs_installed gcc g++
-    if [[ $? -ne 0 ]] ; then
+    # gcc and g++ will fail to correctly build Factor on Cygwin
+    if test_programs_installed gcc g++ ; then
         [ -z "$CC" ] && CC=gcc
         [ -z "$CXX" ] && CXX=g++
         return
@@ -173,7 +169,13 @@ set_cc() {
 }
 
 set_make() {
-    MAKE='make'
+    case $OS in
+        freebsd) MAKE="gmake" ;;
+        *) MAKE="make" ;;
+    esac
+    if [[ $MAKE = "gmake" ]] ; then
+        ensure_program_installed gmake
+    fi
 }
 
 check_installed_programs() {
@@ -181,8 +183,8 @@ check_installed_programs() {
     ensure_program_installed uname
     ensure_program_installed git
     ensure_program_installed wget curl
-    ensure_program_installed clang gcc
-    ensure_program_installed clang++ g++ cl
+    ensure_program_installed clang x86_64-w64-mingw32-gcc i686-w64-mingw32-gcc gcc
+    ensure_program_installed clang++ x86_64-w64-mingw32-g++ i686-w64-mingw32-g++ g++ cl
     ensure_program_installed make gmake
     ensure_program_installed md5sum md5
     ensure_program_installed cut
@@ -193,16 +195,15 @@ check_library_exists() {
     GCC_OUT=factor-library-test.out
     $ECHO -n "Checking for library $1..."
     $ECHO "int main(){return 0;}" > $GCC_TEST
-    $CC $GCC_TEST -o $GCC_OUT -l $1 2>&-
-    if [[ $? -ne 0 ]] ; then
+    if $CC $GCC_TEST -o $GCC_OUT -l "$1" 2>&- ; then
         $ECHO "not found."
     else
         $ECHO "found."
     fi
-    $DELETE -f $GCC_TEST
-    check_ret $DELETE
-    $DELETE -f $GCC_OUT
-    check_ret $DELETE
+    rm -f $GCC_TEST
+    check_ret rm
+    rm -f $GCC_OUT
+    check_ret rm
 }
 
 check_X11_libraries() {
@@ -226,9 +227,9 @@ check_gtk_libraries() {
 
 check_libraries() {
     case $OS in
-            linux) check_X11_libraries
-                   check_gtk_libraries;;
-            unix) check_gtk_libraries;;
+        linux) check_X11_libraries
+               check_gtk_libraries ;;
+        unix) check_gtk_libraries ;;
     esac
 }
 
@@ -243,17 +244,22 @@ check_factor_exists() {
 find_os() {
     if [[ -n $OS ]] ; then return; fi
     $ECHO "Finding OS..."
-    local uname_s=$(uname -s)
+    local uname_s
+    uname_s=$(uname -s)
     check_ret uname
     case $uname_s in
-        CYGWIN_NT-5.2-WOW64) OS=windows;;
-        *CYGWIN_NT*) OS=windows;;
-        *CYGWIN*) OS=windows;;
-        MINGW32*) OS=windows;;
-        *darwin*) OS=macosx;;
-        *Darwin*) OS=macosx;;
-        *linux*) OS=linux;;
-        *Linux*) OS=linux;;
+        CYGWIN_NT-5.2-WOW64) OS=windows ;;
+        *CYGWIN_NT*) OS=windows ;;
+        *CYGWIN*) OS=windows ;;
+        MINGW32*) OS=windows ;;
+        MINGW64*) OS=windows ;;
+        MSYS_NT*) OS=windows ;;
+        *darwin*) OS=macosx ;;
+        *Darwin*) OS=macosx ;;
+        *linux*) OS=linux ;;
+        *Linux*) OS=linux ;;
+        FreeBSD) OS=freebsd ;;
+        Haiku) OS=haiku ;;
     esac
 }
 
@@ -263,77 +269,80 @@ find_architecture() {
     uname_m=$(uname -m)
     check_ret uname
     case $uname_m in
-       i386) ARCH=x86;;
-       i686) ARCH=x86;;
-       i86pc) ARCH=x86;;
-       amd64) ARCH=x86;;
-       ppc64) ARCH=ppc;;
-       *86) ARCH=x86;;
-       *86_64) ARCH=x86;;
-       "Power Macintosh") ARCH=ppc;;
+       i386) ARCH=x86 ;;
+       i686) ARCH=x86 ;;
+       i86pc) ARCH=x86 ;;
+       amd64) ARCH=x86 ;;
+       ppc64) ARCH=ppc ;;
+       *86) ARCH=x86 ;;
+       *86_64) ARCH=x86 ;;
+       aarch64) ARCH=arm ;;
+       arm64) ARCH=arm ;;
+       iPhone5*[3-9]) ARCH=arm ;;
+       iPhone[6-9]*) ARCH=arm ;;
+       iPhone[1-9][0-9]*) ARCH=arm ;;
+       iPad[4-9]*) ARCH=arm ;;
+       iPad[1-9][0-9]*) ARCH=arm ;;
+       AppleTV[5-9]*) ARCH=arm ;;
+       AppleTV[1-9][0-9]*) ARCH=arm ;;
+       "Power Macintosh") ARCH=ppc ;;
     esac
 }
 
 find_num_cores() {
-    $ECHO "Finding num cores..."
-    NUM_CORES=7ZZ
+    $ECHO "Finding NUM_CORES..."
+    NUM_CORES=1
     uname_s=$(uname -s)
     check_ret uname
     case $uname_s in
-        CYGWIN_NT-5.2-WOW64 | *CYGWIN_NT* | *CYGWIN* | MINGW32*) NUM_CORES=$NUMBER_OF_PROCESSORS;;
-        *darwin* | *Darwin* | *linux* | *Linux*) NUM_CORES=$(getconf _NPROCESSORS_ONLN);;
+        CYGWIN_NT-5.2-WOW64 | *CYGWIN_NT* | *CYGWIN* | MINGW32*) NUM_CORES=$NUMBER_OF_PROCESSORS ;;
+        *linux* | *Linux*) NUM_CORES=$(getconf _NPROCESSORS_ONLN || nproc) ;;
+        *darwin* | *Darwin* | freebsd) NUM_CORES=$(sysctl -n hw.ncpu) ;;
     esac
 }
 
-echo_test_program() {
-    #! Must be 'echo'
-    echo -e "int main(){ return (long)(8*sizeof(void*)); }"
-}
-
-c_find_word_size() {
+find_word_size() {
+    if [[ -n $WORD ]] ; then return; fi
     $ECHO "Finding WORD..."
-    C_WORD="factor-word-size"
-    echo_test_program | $CC -o $C_WORD -xc -
-    check_ret $CC
-    ./$C_WORD
-    WORD=$?
-    $DELETE -f $C_WORD
+    WORD=$(getconf LONG_BIT || find_word_size_cpp || find_word_size_c)
 }
 
-intel_macosx_word_size() {
-    ensure_program_installed sysctl
-    $ECHO -n "Testing if your Intel Mac supports 64bit binaries..."
-    sysctl machdep.cpu.extfeatures | grep EM64T >/dev/null
-    if [[ $? -eq 0 ]] ; then
-        WORD=64
-        $ECHO "yes!"
-    else
-        WORD=32
-        $ECHO "no."
-    fi
+find_word_size_cpp() {
+    SIXTY_FOUR='defined(__aarch64__) || defined(__x86_64__) || defined(_M_AMD64) || defined(__PPC64__) || defined(__64BIT__)'
+    THIRTY_TWO='defined(i386) || defined(__i386) || defined(__i386__) || defined(_MIX86)'
+    $CC -E -xc <(echo -e "#if ${SIXTY_FOUR}\n64\n#elif ${THIRTY_TWO}\n32\n#endif") | tail -1
 }
 
-find_word_size() {
-    if [[ -n $WORD ]] ; then return; fi
-    if [[ $OS == macosx && $ARCH == x86 ]] ; then
-        intel_macosx_word_size
-    else
-        c_find_word_size
-    fi
+find_word_size_c() {
+    C_WORD="factor-word-size"
+    TEST_PROGRAM="int main(){ return (long)(8*sizeof(void*)); }"
+    echo "$TEST_PROGRAM" | $CC -o $C_WORD -xc -
+    check_ret "$CC"
+    ./$C_WORD
+    WORD_OUT=$?
+    case $WORD_OUT in
+        32) ;;
+        64) ;;
+        *)
+            echo "Word size should be 32/64, got '$WORD_OUT'"
+            exit_script 15 ;;
+    esac
+    rm -f $C_WORD
+    echo "$WORD_OUT"
 }
 
 set_factor_binary() {
     case $OS in
-        windows) FACTOR_BINARY=factor.com;;
-        *) FACTOR_BINARY=factor;;
+        windows) FACTOR_BINARY=factor.com ;;
+        *) FACTOR_BINARY=factor ;;
     esac
 }
 
 set_factor_library() {
     case $OS in
-        windows) FACTOR_LIBRARY=factor.dll;;
-        macosx) FACTOR_LIBRARY=libfactor.dylib;;
-        *) FACTOR_LIBRARY=libfactor.a;;
+        windows) FACTOR_LIBRARY=factor.dll ;;
+        macosx) FACTOR_LIBRARY=libfactor.dylib ;;
+        *) FACTOR_LIBRARY=libfactor.a ;;
     esac
 }
 
@@ -343,26 +352,28 @@ set_factor_image() {
 }
 
 echo_build_info() {
-    $ECHO OS=$OS
-    $ECHO ARCH=$ARCH
-    $ECHO NUM_CORES=$NUM_CORES
-    $ECHO WORD=$WORD
-    $ECHO DEBUG=$DEBUG
-    $ECHO CURRENT_BRANCH=$CURRENT_BRANCH
-    $ECHO FACTOR_BINARY=$FACTOR_BINARY
-    $ECHO FACTOR_LIBRARY=$FACTOR_LIBRARY
-    $ECHO FACTOR_IMAGE=$FACTOR_IMAGE
-    $ECHO MAKE_TARGET=$MAKE_TARGET
-    $ECHO BOOT_IMAGE=$BOOT_IMAGE
-    $ECHO MAKE_IMAGE_TARGET=$MAKE_IMAGE_TARGET
-    $ECHO GIT_PROTOCOL=$GIT_PROTOCOL
-    $ECHO GIT_URL=$GIT_URL
-    $ECHO DOWNLOADER=$DOWNLOADER
-    $ECHO CC=$CC
-    $ECHO CXX=$CXX
-    $ECHO MAKE=$MAKE
-    $ECHO COPY=$COPY
-    $ECHO DELETE=$DELETE
+    $ECHO "OS=$OS"
+    $ECHO "ARCH=$ARCH"
+    $ECHO "NUM_CORES=$NUM_CORES"
+    $ECHO "WORD=$WORD"
+    $ECHO "DEBUG=$DEBUG"
+    $ECHO "REPRODUCIBLE=$REPRODUCIBLE"
+    $ECHO "CURRENT_BRANCH=$CURRENT_BRANCH"
+    $ECHO "CURRENT_BRANCH_FULL=$CURRENT_BRANCH_FULL"
+    $ECHO "FACTOR_BINARY=$FACTOR_BINARY"
+    $ECHO "FACTOR_LIBRARY=$FACTOR_LIBRARY"
+    $ECHO "FACTOR_IMAGE=$FACTOR_IMAGE"
+    $ECHO "MAKE_TARGET=$MAKE_TARGET"
+    $ECHO "BOOT_IMAGE=$BOOT_IMAGE"
+    $ECHO "MAKE_IMAGE_TARGET=$MAKE_IMAGE_TARGET"
+    $ECHO "GIT_PROTOCOL=$GIT_PROTOCOL"
+    $ECHO "GIT_URL=$GIT_URL"
+    $ECHO "CHECKSUM_URL=$CHECKSUM_URL"
+    $ECHO "BOOT_IMAGE_URL=$BOOT_IMAGE_URL"
+    $ECHO "DOWNLOADER_NAME=$DOWNLOADER_NAME"
+    $ECHO "CC=$CC"
+    $ECHO "CXX=$CXX"
+    $ECHO "MAKE=$MAKE"
 }
 
 check_os_arch_word() {
@@ -379,23 +390,11 @@ check_os_arch_word() {
 
 set_build_info() {
     check_os_arch_word
-    if [[ $OS == linux && $ARCH == ppc ]] ; then
-        MAKE_IMAGE_TARGET=linux-ppc.32
-        MAKE_TARGET=linux-ppc-32
-    elif [[ $OS == windows && $ARCH == x86 && $WORD == 64 ]] ; then
-        MAKE_IMAGE_TARGET=windows-x86.64
-        MAKE_TARGET=windows-x86-64
-    elif [[ $OS == windows && $ARCH == x86 && $WORD == 32 ]] ; then
-        MAKE_IMAGE_TARGET=windows-x86.32
-        MAKE_TARGET=windows-x86-32
-    elif [[ $ARCH == x86 && $WORD == 64 ]] ; then
-        MAKE_IMAGE_TARGET=unix-x86.64
-        MAKE_TARGET=$OS-x86-64
-    elif [[ $ARCH == x86 && $WORD == 32 ]] ; then
-        MAKE_IMAGE_TARGET=unix-x86.32
-        MAKE_TARGET=$OS-x86-32
+    if [[ $OS == "windows" ]] ; then
+        MAKE_IMAGE_TARGET=windows-$ARCH.$WORD
+        MAKE_TARGET=$OS-$ARCH-$WORD
     else
-        MAKE_IMAGE_TARGET=$ARCH.$WORD
+        MAKE_IMAGE_TARGET=unix-$ARCH.$WORD
         MAKE_TARGET=$OS-$ARCH-$WORD
     fi
     BOOT_IMAGE=boot.$MAKE_IMAGE_TARGET.image
@@ -404,9 +403,9 @@ set_build_info() {
 parse_build_info() {
     ensure_program_installed cut
     $ECHO "Parsing make target from command line: $1"
-    OS=$(echo $1 | cut -d '-' -f 1)
-    ARCH=$(echo $1 | cut -d '-' -f 2)
-    WORD=$(echo $1 | cut -d '-' -f 3)
+    OS=$(echo "$1" | cut -d '-' -f 1)
+    ARCH=$(echo "$1" | cut -d '-' -f 2)
+    WORD=$(echo "$1" | cut -d '-' -f 3)
 
     if [[ $OS == linux && $ARCH == ppc ]] ; then WORD=32; fi
     if [[ $OS == linux && $ARCH == arm ]] ; then WORD=32; fi
@@ -417,7 +416,7 @@ parse_build_info() {
     $ECHO "WORD=$WORD"
 }
 
-find_build_info() {
+prepare_build_info() {
     find_os
     find_architecture
     find_num_cores
@@ -429,7 +428,12 @@ find_build_info() {
     set_factor_image
     set_build_info
     set_downloader
+    set_boot_image_vars
     set_make
+}
+
+find_build_info() {
+    prepare_build_info
     echo_build_info
 }
 
@@ -439,71 +443,61 @@ invoke_git() {
 }
 
 git_clone() {
-    $ECHO "Downloading the git repository from factorcode.org..."
-    invoke_git clone $GIT_URL
+    $ECHO "Downloading the git repository from github.com..."
+    invoke_git clone "$GIT_URL"
 }
 
 update_script_name() {
-    $ECHO "$(dirname $0)/_update.sh"
+    $ECHO "$(dirname "$0")/_update.sh"
 }
 
 update_script() {
-    local -r update_script=$(update_script_name)
-    local -r bash_path=$(which bash)
-    $ECHO "#!$bash_path" >"$update_script"
-    $ECHO "git pull \"$GIT_URL\" master" >>"$update_script"
-    $ECHO "if [[ \$? -eq 0 ]]; then exec \"$0\" $SCRIPT_ARGS; else echo \"git pull failed\"; exit 2; fi" \
-        >>"$update_script"
-    $ECHO "exit 0" >>"$update_script"
-
-    chmod 755 "$update_script"
-    exec "$update_script"
+  set_current_branch
+  local -r update_script=$(update_script_name)
+  local -r shell_path="$SHELL"
+  {
+    echo "#!$shell_path"
+    echo "set -ex"
+    echo "git pull ${GIT_URL} ${CURRENT_BRANCH}"
+    echo "exit 0"
+  } > "$update_script"
+  chmod 755 "$update_script"
+  $ECHO "Running the build.sh updater script: $update_script"
+  exec "$update_script"
 }
 
 update_script_changed() {
-    invoke_git diff --stat "$(invoke_git merge-base HEAD FETCH_HEAD)" FETCH_HEAD | grep 'build\.sh' >/dev/null
+    invoke_git diff --stat "$(invoke_git merge-base HEAD FETCH_HEAD)" FETCH_HEAD | grep "build.sh" >/dev/null
 }
 
-git_fetch_factorcode() {
-    $ECHO "Fetching the git repository from factorcode.org..."
+git_fetch() {
+    $ECHO "Fetching the git repository from github.com..."
+    set_current_branch
 
     rm -f "$(update_script_name)"
-    invoke_git fetch "$GIT_URL" master
+    $ECHO git fetch "$GIT_URL" "${CURRENT_BRANCH}"
+    invoke_git fetch "$GIT_URL" "${CURRENT_BRANCH}"
 
     if update_script_changed; then
         $ECHO "Updating and restarting the build.sh script..."
         update_script
     else
         $ECHO "Updating the working tree..."
-        invoke_git pull "$GIT_URL" master
+        invoke_git pull "$GIT_URL" "${CURRENT_BRANCH}"
     fi
 }
 
 cd_factor() {
-    cd "factor"
+    cd "factor" || exit 12
     check_ret cd
 }
 
-set_copy() {
-    case $OS in
-        windows) COPY=cp;;
-        *) COPY=cp;;
-    esac
-}
-
-set_delete() {
-    case $OS in
-        windows) DELETE=rm;;
-        *) DELETE=rm;;
-    esac
-}
-
 backup_factor() {
     $ECHO "Backing up factor..."
-    $COPY $FACTOR_BINARY $FACTOR_BINARY.bak
-    $COPY $FACTOR_LIBRARY $FACTOR_LIBRARY.bak
-    $COPY $BOOT_IMAGE $BOOT_IMAGE.bak
-    $COPY $FACTOR_IMAGE $FACTOR_IMAGE.bak
+    cp "$FACTOR_BINARY" "$FACTOR_BINARY.bak"
+    cp "$FACTOR_LIBRARY" "$FACTOR_LIBRARY.bak"
+    cp "$BOOT_IMAGE" "$BOOT_IMAGE.bak"
+    cp "$FACTOR_IMAGE" "$FACTOR_IMAGE.bak"
     $ECHO "Done with backup."
 }
 
@@ -520,7 +514,11 @@ check_makefile_exists() {
 
 invoke_make() {
     check_makefile_exists
-    $MAKE $MAKE_OPTS "$@"
+    if [ -n "$MAKE_OPTS" ]; then
+        "$MAKE" "$MAKE_OPTS" "$@"
+    else
+        "$MAKE" "$@"
+    fi
     check_ret $MAKE
 }
 
@@ -530,7 +528,7 @@ make_clean() {
 
 make_factor() {
     $ECHO "Building factor with $NUM_CORES cores"
-    invoke_make CC=$CC CXX=$CXX $MAKE_TARGET -j$NUM_CORES
+    invoke_make "CC=$CC" "CXX=$CXX" "$MAKE_TARGET" "-j$NUM_CORES"
 }
 
 make_clean_factor() {
@@ -539,22 +537,20 @@ make_clean_factor() {
 }
 
 current_git_branch() {
-    git rev-parse --abbrev-ref HEAD
+    # git rev-parse --abbrev-ref HEAD # outputs HEAD for detached head
+    # outputs nothing for detached HEAD, which is fine for ``git fetch``
+    git describe --all --exact-match 2>/dev/null
 }
 
+
 check_url() {
     if [[ $DOWNLOADER_NAME == 'wget' ]]; then
-        if [[ $(wget -S --spider $1 2>&1 | grep 'HTTP/1.1 200 OK') ]]; then
-            return 0
-        else
-            return 1
-        fi
+        wget -S --spider --prefer-family=IPv4 "$1" 2>&1 | grep -q 'HTTP/[12].[01] [23]..' && return 0 || return 1
     elif [[ $DOWNLOADER_NAME == 'curl' ]]; then
-        local code=$(curl -sL -w "%{http_code}\\n" "$1" -o /dev/null)
-        if [[ $code -eq 200 ]]; then return 0; else return 1; fi
+        curl -4 -sL -w "%{http_code}\\n" "$1" -o /dev/null | grep -qE '^(2[0-9]{2})$' && return 0 || return 1
     else
-        $ECHO "error: wget or curl required in check_url"
-        exit_script 12
+        echo "error: wget or curl required to check URL"
+        exit 12
     fi
 }
 
@@ -562,14 +558,18 @@ check_url() {
 # Otherwise, just use `master`
 set_boot_image_vars() {
     set_current_branch
-    local url="http://downloads.factorcode.org/images/${CURRENT_BRANCH}/checksums.txt"
-    check_url $url
-    if [[ $? -eq 0 ]]; then
+    local url="https://downloads.factorcode.org/images/${CURRENT_BRANCH}/checksums.txt"
+    $ECHO "Getting checksum from ${url}"
+
+    if check_url "$url"; then
+        $ECHO "got checksum!"
         CHECKSUM_URL="$url"
-        BOOT_IMAGE_URL="http://downloads.factorcode.org/images/${CURRENT_BRANCH}/${BOOT_IMAGE}"
+        BOOT_IMAGE_URL="https://downloads.factorcode.org/images/${CURRENT_BRANCH}/${BOOT_IMAGE}"
     else
-        CHECKSUM_URL="http://downloads.factorcode.org/images/master/checksums.txt"
-        BOOT_IMAGE_URL="http://downloads.factorcode.org/images/master/${BOOT_IMAGE}"
+        $ECHO "boot image for branch \`${CURRENT_BRANCH}\` is not on server, trying master instead"
+        $ECHO "  tried nonexistent url: ${url}"
+        CHECKSUM_URL="https://downloads.factorcode.org/images/master/checksums.txt"
+        BOOT_IMAGE_URL="https://downloads.factorcode.org/images/master/${BOOT_IMAGE}"
     fi
 }
 
@@ -577,28 +577,30 @@ set_current_branch() {
     if [ -n "${CI_BRANCH}" ]; then
         CURRENT_BRANCH="${CI_BRANCH}"
     else
-        CURRENT_BRANCH=$(current_git_branch)
+        CURRENT_BRANCH_FULL=$(current_git_branch)
+        CURRENT_BRANCH=$($ECHO "$CURRENT_BRANCH_FULL" | sed 's=heads/==;s=remotes/==')
     fi
 }
 
 update_boot_image() {
     set_boot_image_vars
     $ECHO "Deleting old images..."
-    $DELETE checksums.txt* > /dev/null 2>&1
-    # delete boot images with one or two characters after the dot
-    $DELETE $BOOT_IMAGE.{?,??} > /dev/null 2>&1
-    $DELETE temp/staging.*.image > /dev/null 2>&1
+    rm -f checksums.txt* > /dev/null 2>&1
+    rm -f "$BOOT_IMAGE".{?,??} > /dev/null 2>&1
+    rm -f temp/staging.*.image > /dev/null 2>&1
     if [[ -f $BOOT_IMAGE ]] ; then
-        get_url $CHECKSUM_URL
-        factorcode_md5=$(cat checksums.txt | grep $BOOT_IMAGE | cut -f2 -d' ')
+        get_url "$CHECKSUM_URL"
+        local factorcode_md5
+        factorcode_md5=$(grep "$BOOT_IMAGE" checksums.txt | cut -f2 -d' ')
         set_md5sum
-        disk_md5=$($MD5SUM $BOOT_IMAGE | cut -f1 -d' ')
-        $ECHO "Factorcode md5: $factorcode_md5";
-        $ECHO "Disk md5: $disk_md5";
+        local disk_md5
+        disk_md5=$($MD5SUM "$BOOT_IMAGE" | cut -f1 -d' ')
+        $ECHO "Factorcode md5: $factorcode_md5"
+        $ECHO "Disk md5: $disk_md5"
         if [[ "$factorcode_md5" == "$disk_md5" ]] ; then
-            $ECHO "Your disk boot image matches the one on factorcode.org."
+            $ECHO "Your disk boot image matches the one on downloads.factorcode.org."
         else
-            $DELETE $BOOT_IMAGE > /dev/null 2>&1
+            rm -f "$BOOT_IMAGE" > /dev/null 2>&1
             get_boot_image
         fi
     else
@@ -612,12 +614,10 @@ get_boot_image() {
 }
 
 get_url() {
-    if [[ -z $DOWNLOADER ]] ; then
-        set_downloader;
+    if [[ -z $DOWNLOADER_NAME ]] ; then
+        set_downloader_name
     fi
-    $ECHO $DOWNLOADER $1 ;
-    $DOWNLOADER $1
-    check_ret $DOWNLOADER
+    download_with_downloader "$1"
 }
 
 get_config_info() {
@@ -628,11 +628,52 @@ get_config_info() {
 
 copy_fresh_image() {
     $ECHO "Copying $FACTOR_IMAGE to $FACTOR_IMAGE_FRESH..."
-    $COPY $FACTOR_IMAGE $FACTOR_IMAGE_FRESH
+    cp "$FACTOR_IMAGE" "$FACTOR_IMAGE_FRESH"
+}
+
+check_launch_factor() {
+    "./$FACTOR_BINARY" -e=
+    check_ret "Could not launch ./$FACTOR_BINARY"
+}
+
+is_boot_image_outdated() {
+    "./$FACTOR_BINARY" "-e=USE: system \"\" to-refresh 2drop length 0 > 1 0 ? exit"
+    return $?
+}
+
+info_boot_image() {
+    prepare_build_info
+    if [[ -f $BOOT_IMAGE ]] ; then
+        get_url "$CHECKSUM_URL"
+        local factorcode_md5
+        factorcode_md5=$(grep "$BOOT_IMAGE" checksums.txt | cut -f2 -d' ')
+        set_md5sum
+        local disk_md5
+        disk_md5=$($MD5SUM "$BOOT_IMAGE" | cut -f1 -d' ')
+        $ECHO "Boot image @factorcode.org md5: $factorcode_md5"
+        $ECHO "Boot image @local disk     md5: $disk_md5"
+        if [[ "$factorcode_md5" == "$disk_md5" ]] ; then
+            $ECHO "Your disk boot image matches the one on downloads.factorcode.org."
+        else
+            $ECHO "Your disk boot image and the one on downloads.factorcode.org mismatch"
+        fi
+    fi
+}
+
+info_check_factor_refresh_all_locally() {
+    prepare_build_info
+    check_launch_factor
+
+    if is_boot_image_outdated; then
+        $ECHO "Your Factor image is consistent with the local source code."
+    else
+        $ECHO "Your Factor image is not consistent with the local source code."
+    fi
 }
 
 bootstrap() {
-    ./$FACTOR_BINARY -i=$BOOT_IMAGE
+    ./$FACTOR_BINARY -i="$BOOT_IMAGE"
+    check_ret "./$FACTOR_BINARY bootstrap failed"
     copy_fresh_image
 }
 
@@ -649,7 +690,7 @@ install() {
 
 update() {
     get_config_info
-    git_fetch_factorcode
+    git_fetch
     backup_factor
     make_clean_factor
 }
@@ -671,12 +712,12 @@ refresh_image() {
 }
 
 make_boot_image() {
-    ./$FACTOR_BINARY -e="\"$MAKE_IMAGE_TARGET\" USING: system bootstrap.image memory ; make-image save 0 exit"
+    ./$FACTOR_BINARY -run="bootstrap.image" "$MAKE_IMAGE_TARGET"
     check_ret factor
 }
 
 install_deps_apt() {
-    sudo apt install --yes libc6-dev libpango1.0-dev libx11-dev xorg-dev libgtk2.0-dev gtk2-engines-pixbuf libgtkglext1-dev wget git git-doc rlwrap clang gcc make screen tmux libssl-dev g++
+    sudo apt install --yes libc6-dev libpango1.0-dev libx11-dev xorg-dev libgtk2.0-dev gtk2-engines-pixbuf libgtkglext1-dev wget git git-doc rlwrap clang make screen tmux libssl-dev
     check_ret sudo
 }
 
@@ -690,10 +731,13 @@ install_deps_dnf() {
     check_ret sudo
 }
 
+install_deps_pkg() {
+    sudo pkg install --yes bash git gmake gcc rlwrap ripgrep curl gmake x11-toolkits/gtk30 x11-toolkits/gtkglext pango cairo vim
+}
+
 
 install_deps_macosx() {
-    test_program_installed git
-    if [[ $? -ne 1 ]] ; then
+    if test_program_installed git; then
         ensure_program_installed yes
         $ECHO "git not found."
         $ECHO "This script requires either git-core or port."
@@ -710,15 +754,22 @@ usage() {
     $ECHO "  deps-apt - install required packages for Factor on Linux using apt"
     $ECHO "  deps-pacman - install required packages for Factor on Linux using pacman"
     $ECHO "  deps-dnf - install required packages for Factor on Linux using dnf"
+    $ECHO "  deps-pkg - install required packages for Factor on FreeBSD using pkg"
     $ECHO "  deps-macosx - install git on MacOSX using port"
+    $ECHO "  info-boot-image - print remote and disk boot image MD5"
+    $ECHO "  info-check-factor-refresh-all-locally - check if local sources would cause refresh-all to change the image"
+    $ECHO "  self-bootstrap - make local boot image, bootstrap"
     $ECHO "  self-update - git pull, recompile, make local boot image, bootstrap"
     $ECHO "  quick-update - git pull, refresh-all, save"
     $ECHO "  update|latest - git pull, recompile, download a boot image, bootstrap"
+    $ECHO "  compile - compile the binary"
+    $ECHO "  recompile - recompile the binary"
     $ECHO "  bootstrap - bootstrap with existing boot image"
     $ECHO "  net-bootstrap - recompile, download a boot image, bootstrap"
     $ECHO "  make-target - find and print the os-arch-cpu string"
-    $ECHO "  report - print the build variables"
-    $ECHO "  update-boot-image - get the boot image for the current branch of for master"
+    $ECHO "  report|info - print the build variables"
+    $ECHO "  full-report - print the build variables, check programs and libraries"
+    $ECHO "  update-boot-image - get the boot image for the current branch"
     $ECHO ""
     $ECHO "If you are behind a firewall, invoke as:"
     $ECHO "env GIT_PROTOCOL=http $0 <command>"
@@ -731,11 +782,14 @@ MAKE_TARGET=unknown
 
 # -n is nonzero length, -z is zero length
 if [[ -n "$2" ]] ; then
-    parse_build_info $2
+    parse_build_info "$2"
 fi
 
-set_copy
-set_delete
+if [ "$#" -gt 3 ]; then
+    usage
+    $ECHO "error: too many arguments"
+    exit 1
+fi
 
 case "$1" in
     install) install ;;
@@ -743,16 +797,22 @@ case "$1" in
     deps-pacman) install_deps_pacman ;;
     deps-macosx) install_deps_macosx ;;
     deps-dnf) install_deps_dnf ;;
-    self-update) update; make_boot_image; bootstrap;;
+    deps-pkg) install_deps_pkg ;;
+    info-boot-image) info_boot_image ;;
+    info-check-factor-refresh-all-locally) info_check_factor_refresh_all_locally ;;
+    update-boot-image) find_build_info; check_installed_programs; update_boot_image ;;
+    self-bootstrap) get_config_info; make_boot_image; bootstrap  ;;
+    self-update) update; make_boot_image; bootstrap  ;;
     quick-update) update; refresh_image ;;
-    update) update; download_and_bootstrap ;;
-    latest) update; download_and_bootstrap ;;
+    update|latest) update; download_and_bootstrap ;;
+    compile) find_build_info; make_factor ;;
+    recompile) find_build_info; make_clean; make_factor ;;
     bootstrap) get_config_info; bootstrap ;;
     net-bootstrap) net_bootstrap_no_pull ;;
-    make-target) FIND_MAKE_TARGET=true; ECHO=false; find_build_info; exit_script ;;
-    report) find_build_info ;;
+    make-target) FIND_MAKE_TARGET=true; ECHO=false; find_build_info; exit_script 0;;
+    report|info) find_build_info ;;
     full-report) find_build_info; check_installed_programs; check_libraries ;;
-    update-boot-image) find_build_info; check_installed_programs; update_boot_image;;
+    update-script) update_script ;;
     *) usage ;;
 esac