From f693f7016f4967914e44aab32adf46484e8a73f8 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Mon, 9 Jul 2012 08:52:35 -0500
Subject: [PATCH] ext/shlib: import shlib as a submodule instead of using a
 local copy

---
 .gitmodules            |   3 +
 script/burn            |   2 +-
 script/ext/shlib       |   1 +
 script/gencard         |   2 +-
 script/geniso          |   2 +-
 script/gentree         |   3 +-
 script/genufs          |   2 +-
 script/genuzip         |   2 +-
 script/lib/ansi.sh     |  59 -------
 script/lib/ask.sh      |  20 ---
 script/lib/chroot.sh   | 368 -----------------------------------------
 script/lib/env.sh      |  35 ----
 script/lib/kvs.sh      |  72 --------
 script/lib/log.sh      |  62 -------
 script/lib/progress.sh |  26 ---
 script/lib/root.sh     |  15 --
 script/lib/skel.sh     |   8 -
 script/loadconf        |   2 +-
 script/makepkg         |   2 +-
 script/makeworld       |   2 +-
 20 files changed, 13 insertions(+), 675 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 script/ext/shlib
 delete mode 100644 script/lib/ansi.sh
 delete mode 100644 script/lib/ask.sh
 delete mode 100644 script/lib/chroot.sh
 delete mode 100644 script/lib/env.sh
 delete mode 100644 script/lib/kvs.sh
 delete mode 100644 script/lib/log.sh
 delete mode 100644 script/lib/progress.sh
 delete mode 100644 script/lib/root.sh
 delete mode 100644 script/lib/skel.sh

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a60722e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "script/ext/shlib"]
+	path = script/ext/shlib
+	url = git://git.cyberleo.net/shlib.git
diff --git a/script/burn b/script/burn
index c8fdf8f..16964f1 100755
--- a/script/burn
+++ b/script/burn
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-_root="$(dirname "${0}")"; . "${_root}/lib/env.sh"
+_root="$(dirname "${0}")"; . "${_root}/lib/sh/env.sh"
 
 want root log
 
diff --git a/script/ext/shlib b/script/ext/shlib
new file mode 160000
index 0000000..58fa539
--- /dev/null
+++ b/script/ext/shlib
@@ -0,0 +1 @@
+Subproject commit 58fa539d35079ad9bc3c59704b9dcf8a30ff7807
diff --git a/script/gencard b/script/gencard
index e1be88b..ef74fbe 100755
--- a/script/gencard
+++ b/script/gencard
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-_root="$(dirname "${0}")"; . "${_root}/lib/env.sh"
+_root="$(dirname "${0}")"; . "${_root}/lib/sh/env.sh"
 want root log
 
 pebkac(){
diff --git a/script/geniso b/script/geniso
index f6bc85b..d689433 100755
--- a/script/geniso
+++ b/script/geniso
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Boilerplate
-_root="$(dirname "${0}")"; . "${_root}/lib/env.sh"
+_root="$(dirname "${0}")"; . "${_root}/lib/sh/env.sh"
 
 # Load needed modules
 want ansi log progress
diff --git a/script/gentree b/script/gentree
index e7eeb76..e6949a5 100755
--- a/script/gentree
+++ b/script/gentree
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 # Boilerplate
-_root="$(dirname "${0}")"
-. "${_root}/lib/env.sh"
+_root="$(dirname "${0}")"; . "${_root}/lib/sh/env.sh"
 
 # Load needed modules
 want root ansi log ask
diff --git a/script/genufs b/script/genufs
index e90a4dc..ecbb562 100755
--- a/script/genufs
+++ b/script/genufs
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-_root="$(dirname "${0}")"; . "${_root}/lib/env.sh"
+_root="$(dirname "${0}")"; . "${_root}/lib/sh/env.sh"
 
 want root log
 
diff --git a/script/genuzip b/script/genuzip
index fb5c4d3..914cf76 100755
--- a/script/genuzip
+++ b/script/genuzip
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Boilerplate
-_root="$(dirname "${0}")"; . "${_root}/lib/env.sh"
+_root="$(dirname "${0}")"; . "${_root}/lib/sh/env.sh"
 
 # Load needed modules
 want ansi log progress
diff --git a/script/lib/ansi.sh b/script/lib/ansi.sh
deleted file mode 100644
index acaf50a..0000000
--- a/script/lib/ansi.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-# Include me for neat color defines!
-
-if [ -z "${__ansi_sh_loaded}" ]
-then
-  __ansi_sh_loaded=yes
-
-  # ANSI formats
-  e="$(printf "\033")"
-
-  # ANSI styles
-  a_bright="$e[1m"
-  a_dim="$e[2m"
-  a_italic="$e[3m"    # Probably won't work
-  a_underline="$e[4m" # Probably won't work
-  a_blink="$e[5m"     # Annoying; probably won't work
-  a_flash="$e[6m"     # Probably won't work
-  a_inverse="$e[7m"
-  a_conceal="$e[8m"   # Probably won't work
-  a_strike="$e[9m"    # Probably won't work
-
-  # ANSI colors
-  a_red="$e[1;31m"
-  a_green="$e[1;32m"
-  a_yellow="$e[1;33m"
-  a_blue="$e[1;34m"
-  a_purple="$e[1;35m"
-  a_cyan="$e[1;36m"
-  a_white="$e[1;37m"
-  a_gloom="$e[1;30m"
-
-  a_crimson="$e[0;31m"
-  a_forest="$e[0;32m"
-  a_brown="$e[0;33m"
-  a_navy="$e[0;34m"
-  a_violet="$e[0;35m"
-  a_aqua="$e[0;36m"
-  a_gray="$e[0;37m"
-  a_black="$e[0;30m"
-
-  a_bred="$e[41m"
-  a_bgreen="$e[42m"
-  a_bbrown="$e[43m"
-  a_bblue="$e[44m"
-  a_bpurple="$e[45m"
-  a_bcyan="$e[46m"
-  a_bgray="$e[47m"
-  a_bblack="$e[40m"
-
-  # Normal is at the bottom, otherwise debugging via 'sh -x' is difficult
-  a_normal="$e[0m"
-
-  a() {
-    while [ "${1}" ]
-    do
-      eval "echo \${a_$1}"
-      shift
-    done
-  }
-fi
diff --git a/script/lib/ask.sh b/script/lib/ask.sh
deleted file mode 100644
index 5990f78..0000000
--- a/script/lib/ask.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-# Simple query library script
-
-if [ -z "${__ask_sh_loaded}" ]
-then
-  __ask_sh_loaded=yes
-  
-  yn() {
-    def="${1:-n}"; shift
-    while true
-    do
-      [ "${#}" -gt 0 ] && printf "${*} "
-      read _res
-      case "${_res:-${def}}" in
-      [Yy]*) return 0 ;;
-      [Nn]*) return 1 ;;
-      *) echo "bad response!"; continue ;;
-      esac
-    done
-  }
-fi
diff --git a/script/lib/chroot.sh b/script/lib/chroot.sh
deleted file mode 100644
index a00a2b7..0000000
--- a/script/lib/chroot.sh
+++ /dev/null
@@ -1,368 +0,0 @@
-# Chroot build handler functions
-
-if [ -z "${__chroot_sh_loaded}" ]
-then
-  __chroot_sh_loaded=yes
-
-  # Where should this one go?
-  #
-  # Dump a list of leaf ports from a working system
-  # Leaf ports are ports that have nothing depending upon them
-  # These are generally the top-level ports; everything else should
-  # be pulled in by them
-  leaf_ports() {
-    ( cd /var/db/pkg; ls -1 ) | while read pkg
-    do
-      pkg_info -Rq "${pkg}" | grep -q '' || pkg_info -oq "${pkg}"
-    done | sort
-  }
-
-  ########
-  #
-  # Configuration variable setup
-  #
-  ########
-
-  # Base directory for everything
-  base_dir="${basedir:-/usr/home/cyberleo/vitanitest}"
-
-  # Ports tree to use for building
-  ports_dir="${ports_dir:-/usr/ports}"
-
-  # Directory where distfiles will be stored between builds
-  dist_dir="${dist_dir:-${base_dir}/distfiles}"
-
-  # Final directory for built packages (Outside chroot)
-  final_pkg_dir="${final_pkg_dir:-${base_dir}/pkg}"
-  final_bdeps_dir="${final_bdeps_dir:-${base_dir}/bdeps}"
-
-  # Chroot directory
-  chroot_dir="${chroot_dir:-${base_dir}/root}"
-
-  # Package directories, must be under ${chroot_dir}
-  pkg_dir="${pkg_dir:-${chroot_dir}/pkg}"
-  bdeps_dir="${bdeps_dir:-${pkg_dir}/bdeps}"
-
-  # Compute in-chroot pkg and bdeps dirs
-  chroot_pkg_dir="${chroot_pkg_dir:-${pkg_dir##${chroot_dir}}}"
-  chroot_bdeps_dir="${chroot_bdeps_dir:-${bdeps_dir##${chroot_dir}}}"
-
-  # Chroot environment
-  chroot_env="${chroot_env:-
-  USER=root
-  HOME=/root
-  LOGNAME=root
-  PATH=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-  SHELL=/bin/sh
-  TERM=${TERM}
-  }"
-
-  ########
-  #
-  # Boilerplate functions
-  #
-  ########
-
-  meh() { printf " \033[1;32m*\033[0m %s\n" "${*}" >&2; }
-  omg() { printf " \033[1;33m*\033[0m %s\n" "${*}" >&2; }
-  wtf() { printf " \033[1;31m*\033[0m %s\n" "${*}" >&2; exit 1; }
-
-  ########
-  #
-  # Chroot handling
-  #
-  ########
-
-  # Setup a chroot
-  chsetup() {
-    # Necessary mountpoints
-    mkdir -p "${chroot_dir}/dev" || return 1
-    mount -t devfs devfs "${chroot_dir}/dev" || return 1
-    mkdir -p "${chroot_dir}/usr/ports" || return 1
-    mount -t nullfs -r "${ports_dir}" "${chroot_dir}/usr/ports" || return 1
-    mkdir -p "${chroot_dir}/var/ports/distfiles" || return 1
-    mount -t nullfs -w "${dist_dir}" "${chroot_dir}/var/ports/distfiles" || return 1
-
-    # Chroot configuration
-    cp -f /etc/resolv.conf "${chroot_dir}/etc/resolv.conf" || return 1
-
-    # Target package directories
-    mkdir -p "${pkg_dir}" || return 1
-    mkdir -p "${bdeps_dir}" || return 1
-  }
-
-  # Tear down a chroot
-  chteardown() {
-    umount "${chroot_dir}/var/ports/distfiles"
-    umount "${chroot_dir}/usr/ports"
-    umount "${chroot_dir}/dev"
-  }
-
-  # Evaluate a command line within the chroot
-  cheval() {
-    chroot "${chroot_dir}" env -i ${chroot_env} /bin/sh -c "cd ${chroot_pkg_dir}; ${*}"
-  }
-
-  # Run chrooted make
-  chmake() {
-    local port="/usr/ports/${1##/usr/ports/}"
-    shift
-    cheval "make -C ${port} ${*}"
-  }
-
-  ########
-  #
-  # Port Dependency Tracking
-  #
-  ########
-
-  # Translate port origin to package name
-  port2pkg() {
-    while [ "${1}" ]
-    do
-      chmake "${1}" -V PKGNAME
-      shift
-    done
-  }
-
-  # Build dependencies (shallow, recursive, package)
-  port_bdeps() {
-    while [ "${1}" ]
-    do
-      chmake "${1}" build-depends-list | sed -e 's#^/usr/ports/##'
-      shift
-    done
-  }
-  port_all_bdeps() { # Test this one further; I'm not confident in the logic
-    # rdeps for rdeps are rdeps, rdeps for bdeps are bdeps; thus:
-    (
-      # Handle bdeps, bdeps of bdeps, and rdeps of bdeps
-      port_bdeps "${@}" | while read port
-      do
-        echo "${port}"
-        port_all_bdeps "${port}"
-        port_all_rdeps "${port}"
-      done
-      # Handle bdeps of rdeps
-      port_all_rdeps "${@}" | while read port
-      do
-        port_all_bdeps "${port}"
-      done
-    ) | sort | uniq
-  }
-  pkg_bdeps() {
-    port2pkg $(port_all_bdeps "${@}")
-  }
-
-  # Runtime dependencies (shallow, recursive, package)
-  port_rdeps() {
-    while [ "${1}" ]
-    do
-      chmake "${1}" run-depends-list | sed -e 's#^/usr/ports/##'
-      shift
-    done
-  }
-  port_all_rdeps() {
-    port_rdeps "${@}" | while read port
-    do
-      echo "${port}"
-      port_all_rdeps "${port}"
-    done | sort | uniq
-  }
-  pkg_rdeps() {
-    port2pkg $(port_all_rdeps "${@}")
-  }
-
-  # All dependencies (shallow, recursive, package)
-  port_deps() {
-    while [ "${1}" ]
-    do
-      chmake "${1}" all-depends-list | sed -e 's#^/usr/ports/##'
-      shift
-    done
-  }
-  port_all_deps() {
-    port_deps "${@}" | while read port
-    do
-      echo "${port}"
-      port_deps "${port}"
-    done | sort | uniq
-  }
-  pkg_deps() {
-    port2pkg $(port_all_deps "${@}")
-  }
-
-  ########
-  #
-  # Port Configuration Handling
-  #
-  ########
-
-  # Run make config on a list of ports
-  port_config() {
-    while [ "${1}" ]
-    do
-      meh "port config ${1}"
-      chmake "${1}" config < /dev/tty
-      shift
-    done
-  }
-
-  # Make config-conditional for a list of ports, and all dependencies
-  port_config_recursive() {
-    # If the first parameter is not --, then clear the cache
-    [ "${1}" == "--" ] && shift || unset _port_config_recursive_cache
-
-    while [ "${1}" ]
-    do
-      # Do not use config-recursive because it computes the depchain first;
-      # instead, manually compute the depchain after each config to ensure the
-      # proper depchain is followed. Use config-conditional to avoid dialog
-      # if the config is already complete. Also use a cache to avoid re-config
-      # and re-recurse on previously handled port branches.
-      if echo "${_port_config_recursive_cache}" | grep -qv " ${1} "
-      then
-        meh "port config-recursive ${1}"
-        chmake "${1}" config-conditional < /dev/tty
-        port_config_recursive -- $(port_deps "${1}")
-        _port_config_recursive_cache="${_port_config_recursive_cache} ${1} "
-      fi
-      shift
-    done
-  }
-
-  # Remove saved config for a list of ports
-  port_rmconfig() {
-    while [ "${1}" ]
-    do
-      meh "port rmconfig ${1}"
-      chmake "${1}" rmconfig
-      shift
-    done
-  }
-
-  # Remove saved config for a list of ports and all dependencies
-  port_rmconfig_recursive() {
-    meh "port rmconfig-recursive ${*}"
-    port_rmconfig $(echo "${@}" $(port_all_deps "${@}") | sort | uniq)
-  }
-
-  # Obliterate saved configuration for all ports
-  port_rmconfig_all() {
-    meh "port rmconfig-all"
-    cheval "cd /var/db/ports; find . -name 'options' -delete; find . -type d | xargs rmdir 2>/dev/null"
-  }
-
-  # Restore port build options from cpio
-  port_load_config() {
-    meh "port load-config"
-    cheval "cd /var/db/ports; cpio -iv"
-  }
-
-  # Dump port build options to cpio
-  port_save_config() {
-    meh "port save-config"
-    cheval "cd /var/db/ports; find . -type d -o -type f -name options | cpio -ovHnewc"
-  }
-
-  ########
-  #
-  # Port distfile handling
-  #
-  ########
-
-  # Recursively retrieve distfiles
-  port_fetch_recursive() {
-    while [ "${1}" ]
-    do
-      meh "fetch-recursive ${1}"
-      chmake "${1}" fetch-recursive
-    done
-  }
-
-  ########
-  #
-  # Port building and packaging
-  #
-  ########
-
-  # Copy in and install dependency packages
-  port_load_deps() {
-    local port="${1}"
-    for pkg in $(port2pkg $(port_all_deps "${port}"))
-    do
-      cp -f "${final_bdeps_dir}/${pkg}.tbz" "${bdeps_dir}" 2>/dev/null && meh "Loading dependent ${pkg}"
-    done
-    if ls "${bdeps_dir}"/*.tbz >/dev/null 2>&1
-    then
-      meh "Installing dependencies"
-      cheval "cd ${chroot_bdeps_dir}; pkg_add -F *" || wtf "port_load_deps ${port} failed"
-    fi
-  }
-
-  # Build and install a port
-  port_build() {
-    local port="${1}"
-    meh "Building ${port}"
-    chmake "${port}" clean build install clean || wtf "port_build ${port} failed"
-  }
-
-  # Package a port
-  port_package() {
-    local port="${1}"
-    meh "Creating rdep package tree for ${port}"
-    cheval "pkg_create -Rvb $(port2pkg "${port}")" || wtf "port_package ${port} failed"
-  }
-
-  # Package port build dependencies, unless they're already run deps
-  port_stash_bdeps() {
-    meh "Stashing unsaved bdeps"
-    # This doesn't work well, because there can be bdeps that aren't listed as bdeps (bison)
-    #for pkg in $(pkg_bdeps "${1}")
-    #do
-    #  [ ! -f "${pkg_dir}/${pkg}.tbz" ] && cheval "cd ${chroot_bdeps_dir}; pkg_create -vb ${pkg}"
-    #done
-    #
-    # Instead, just save everything that's not already in rdeps as bdeps
-    for pkg in $(cheval pkg_info | awk '{print $1}')
-    do
-      if [ ! -f "${pkg_dir}/${pkg}.tbz" -a ! -f "${bdeps_dir}/${pkg}.tbz" ]
-      then
-        cheval "cd ${chroot_bdeps_dir}; pkg_create -vb ${pkg}" || wtf "port_stash_bdeps failed"
-      fi
-    done
-  }
-
-  # Copy generated packages out of tree
-  pkg_final() {
-    meh "Moving created packages to repo"
-    ls "${pkg_dir}"/*.tbz >/dev/null 2>&1 && mv -f "${pkg_dir}"/*.tbz "${final_pkg_dir}"
-    ls "${bdeps_dir}"/*.tbz >/dev/null 2>&1 && mv -f "${bdeps_dir}"/*.tbz "${final_bdeps_dir}"
-    # link everything into ${bdeps_dir} so we can find it easily later
-    ( cd "${final_pkg_dir}"; find . -type f | cpio -plu --quiet "${final_bdeps_dir}" )
-  }
-
-  # Delete all installed packages (hope you saved them first)
-  pkg_delete_all() {
-    meh "Clearing out installed packages"
-    cheval "pkg_delete -f \*" || wtf "pkg_delete_all failed"
-  }
-
-  ########
-  #
-  # All of the above?
-  #
-  ########
-
-  # Execute a complete port build, using prebuilt packages to fulfill dependencies when available
-  # Be sure to chsetup and populate your config before running!
-  chport() {
-    local port="${1}"
-    port_load_deps "${port}"
-    port_build "${port}"
-    port_package "${port}"
-    port_stash_bdeps
-    pkg_final
-    pkg_delete_all
-  }
-fi
diff --git a/script/lib/env.sh b/script/lib/env.sh
deleted file mode 100644
index 6b8e789..0000000
--- a/script/lib/env.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-# Base environment script
-
-if [ -z "${__env_sh_loaded}" ]
-then
-  if [ -z "${_root}" -o ! -d "${_root}" ]
-  then
-    printf "\033[1;31mSet _root to the directory containing lib/ before sourcing this file!\033[0m\n"
-    kill $$
-  fi
-  
-  __env_sh_loaded=yes
-
-  realpath() {
-    ( cd "${1}"; pwd )
-  }
-
-  __env_libdir="$(realpath "${_root}/lib")"
-  want() {
-    while [ -n "${1}" ]
-    do
-      if [ -f "${__env_libdir}/${1}.sh" ]
-      then
-        . "${__env_libdir}/${1}.sh"
-      else
-        printf "\033[1;31mFailed to load '${1}'\033[0m\n"
-      fi
-      shift
-    done
-  }
-  
-  err() {
-    echo " ** ${*}"
-    exit 1
-  }
-fi
diff --git a/script/lib/kvs.sh b/script/lib/kvs.sh
deleted file mode 100644
index 2b165ff..0000000
--- a/script/lib/kvs.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-# Simple bourne shell based key-value store
-
-if [ -z "${__kvs_sh_loaded}" ]
-then
-  __kvs_sh_loaded=yes
-
-t="$(printf '\t')"
-
-[ "${kvs}" ] || {
-  cat <<EOF
-KVS v0.1
-Copyright - http://wiki.cyberleo.net/wiki/CyberLeo/COPYRIGHT?version=4
-
-Set the following variables before sourcing this library:
-
- kvs  - Path and filename of the kvdb database file
-EOF
-  kill $$
-  exit 1
-}
-
-
-[ -s "${kvs}" ] || echo "${t}${t}# KVSv0 id-key-value database" > "${kvs}"
-
-# Add or replace a value stored for a given key and id in the kvs
-kvs_set() {
-  [ "${1}" -a "${2}" ] || return 255
-  local id="${1}"
-  local var="${2}"
-  local val="${3}"
-  printf "%s\t%s\t%s\n" "${id}" "${var}" "${val}" >> "${kvs}"
-}
-
-# Fetch the most recent value stored for a given key and id from the kvs
-kvs_get() {
-  [ "${1}" -a "${2}" ] || return 255
-  local id="${1}"
-  local var="${2}"
-  grep "^${id}${t}${var}${t}" "${kvs}" | tail -n 1 | cut -d"${t}" -f3-
-}
-
-# Does the kvs have any entries for a given ID?
-kvs_has_id() {
-  [ "${1}" ] || return 255
-  local id="${1}"
-  grep -q "^${id}${t}" "${kvs}"
-}
-
-# Does the kvs have a given key for a given ID?
-kvs_has_key() {
-  [ "${1}" -a "${2}" ] || return 255
-  local id="${1}"
-  local var="${2}"
-  grep -q "^${id}${t}${var}${t}" "${kvs}"
-}
-
-# Remove a given key with a given ID from the kvs
-kvs_unset() {
-  [ "${1}" -a "${2}" ] || return 255
-  local id="${1}"
-  local var="${2}"
-  grep -v "^${id}${t}${var}${t}" "${kvs}" > "${kvs}.tmp" && mv -f "${kvs}.tmp" "${kvs}" || rm -f "${kvs}.tmp"
-}
-
-# Remove all keys with a given ID from the kvs
-kvs_unset_all() {
-  [ "${1}" ] || return 255
-  local id="${1}"
-  grep -v "^${id}${t}" "${kvs}" > "${kvs}.tmp" && mv -f "${kvs}.tmp" "${kvs}" || rm -f "${kvs}.tmp"
-}
-
-fi
diff --git a/script/lib/log.sh b/script/lib/log.sh
deleted file mode 100644
index 6fa665b..0000000
--- a/script/lib/log.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-# Include for convenience log functions
-# Set _log_to_stderr to send messages to stderr as well, for logging
-
-if [ -z "${__log_sh_loaded}" ]
-then
-  __log_sh_loaded=yes
-  
-  want ansi
-
-  logf() {
-    printf "${@}"
-    [ -n "${_log_to_stderr}" ] && printf "${@}" >&2
-    return 0
-  }
-
-  note() {
-    printf " ${a_cyan}*${a_normal} "
-    echo "${*}"
-    [ -n "${_log_to_stderr}" ] && echo "* note: ${*}" >&2
-    return 0
-  }
-
-  log() {
-    printf " ${a_green}*${a_normal} "
-    echo "${*}"
-    [ -n "${_log_to_stderr}" ] && echo "* log: ${*}" >&2
-    return 0
-  }
-  alias meh=log
-
-  warn() {
-    printf " ${a_yellow}*${a_normal} "
-    echo "${*}"
-    [ -n "${_log_to_stderr}" ] && echo "* warn: ${*}" >&2
-    return 0
-  }
-  alias omg=warn
-
-  err() {
-    printf " ${a_red}*${a_normal} "
-    echo "${*}"
-    [ -n "${_log_to_stderr}" ] && echo "* err: ${*}" >&2
-    exit 1
-  }
-  alias wtf=err
-
-  chk() {
-    _res=$?
-    if [ $# -gt 0 ]
-    then
-      out=$("${@}")
-      _res=$?
-    fi
-    if [ ${_res} -gt 0 ]
-    then
-      [ -n "${*}" ] && echo " ${a_red}*${a_normal} in '$(pwd)': cmd '${*}' failed with status ${_res}"
-      [ -n "${out}" ] && printf " ${a_red}*${a_normal} Output:\n${out}\n"
-      echo ""
-      kill $$
-    fi
-  }
-fi
diff --git a/script/lib/progress.sh b/script/lib/progress.sh
deleted file mode 100644
index fea648c..0000000
--- a/script/lib/progress.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-# Progress library script
-
-if [ -z "${__progress_sh_loaded}" ]
-then
-  __progress_sh_loaded=yes
-  
-  # Implement a simple progress indicator
-  # ( i:current i:total i:width -- s:
-  progress() {
-    local time_last
-
-    cur="${1}"
-    all="${2}"
-    width="${3:-78}"
-
-    time="$(date +%s)"
-
-    prcnt="$(printf "%u / %u * 100\n" "${cur}" "${all}" | bc -l 2>/dev/null)"
-    elapsed="$(printf "%u - %u\n" "${time}" "${time_start}" | bc -l 2>/dev/null)"
-    remain="$(printf "( %u - %u ) / ( %u / %u )\n" "${all}" "${cur}" "${cur}" "${elapsed}" | bc -l 2>/dev/null)"
-
-    time_last="${time}"
-
-    printf "%0.2f%% E:%us R:%0.1fs" "${prcnt:-0}" "${elapsed:-0}" "${remain:-0}"
-  }
-fi
diff --git a/script/lib/root.sh b/script/lib/root.sh
deleted file mode 100644
index 7a4e60f..0000000
--- a/script/lib/root.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-# Only allow the script to continue if running as root
-
-if [ -z "${__root_sh_loaded}" ]
-then
-  __root_sh_loaded=yes
-  
-  if [ "$(id -u)" -gt 0 ]
-  then
-    want ansi
-    echo ""
-    echo "${a_red}I need root!${a_normal}"
-    echo ""
-    exit 1
-  fi
-fi
diff --git a/script/lib/skel.sh b/script/lib/skel.sh
deleted file mode 100644
index 63bc60a..0000000
--- a/script/lib/skel.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Skeleton library script
-
-if [ -z "${__skel_sh_loaded}" ]
-then
-  __skel_sh_loaded=yes
-  
-  # Put your stuff here  
-fi
diff --git a/script/loadconf b/script/loadconf
index 0cd51d1..141ee7d 100755
--- a/script/loadconf
+++ b/script/loadconf
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-_root="$(dirname "${0}")"; . "${_root}/lib/env.sh"
+_root="$(dirname "${0}")"; . "${_root}/lib/sh/env.sh"
 want root log
 
 err "Don't use me yet!"
diff --git a/script/makepkg b/script/makepkg
index a1f57e0..d2f9185 100755
--- a/script/makepkg
+++ b/script/makepkg
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Load shlib and modules
-_root="$(dirname "${0}")"; . "${_root}/lib/env.sh"
+_root="$(dirname "${0}")"; . "${_root}/lib/sh/env.sh"
 want log root
 
 ########
diff --git a/script/makeworld b/script/makeworld
index fb882eb..83cc800 100755
--- a/script/makeworld
+++ b/script/makeworld
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Load shlib and modules
-_root="$(dirname "${0}")"; . "${_root}/lib/env.sh"
+_root="$(dirname "${0}")"; . "${_root}/lib/sh/env.sh"
 want log
 
 pebkac() {
-- 
2.42.0