From 962250da23024224fc9e0be782b16ae08df46671 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 2 May 2013 15:06:04 -0400
Subject: Update for the new devtools-par (major)

 * `src/devtools`: Redo to get devtools from another location, and patch it
 * `src/chroot-tools/{chcleanup,chroot.conf}`: Only install 'base-devel' by
   default
 * libremkchroot: deprecate in favor of `librechroot make`
 * librechroot:
   - redo option parsing to be a "sub-command" (git-like) interface,
     instead of having esoteric flags (pacman-like).
   - add more documentation.
   - allow COPY to be an absolute path
   - generally clean up and use updated functions from `makechrootpkg.sh`
 * libremakepkg:
   - allow COPY to be an absolute path
   - update to work with the new `makechrootpkg.sh`:
     - `makechrootpkg.sh:chroot_exec()` -> `libremakepkg:run()`
     - `makechrootpkg.sh:chroot_init()` -> `libremakepkg:chroot_init()`
     - All functions from `makechrootpkg.sh` are wrapped, because they
       don't work with `set -euE`.
     - Other small changes
---
 src/devtools/lib/common.sh | 186 ---------------------------------------------
 1 file changed, 186 deletions(-)
 delete mode 100644 src/devtools/lib/common.sh

(limited to 'src/devtools/lib/common.sh')

diff --git a/src/devtools/lib/common.sh b/src/devtools/lib/common.sh
deleted file mode 100644
index d6fbe7c..0000000
--- a/src/devtools/lib/common.sh
+++ /dev/null
@@ -1,186 +0,0 @@
-# Avoid any encoding problems
-export LANG=C
-
-# check if messages are to be printed using color
-unset ALL_OFF BOLD BLUE GREEN RED YELLOW
-if [[ -t 2 ]]; then
-	# prefer terminal safe colored and bold text when tput is supported
-	if tput setaf 0 &>/dev/null; then
-		ALL_OFF="$(tput sgr0)"
-		BOLD="$(tput bold)"
-		BLUE="${BOLD}$(tput setaf 4)"
-		GREEN="${BOLD}$(tput setaf 2)"
-		RED="${BOLD}$(tput setaf 1)"
-		YELLOW="${BOLD}$(tput setaf 3)"
-	else
-		ALL_OFF="\e[1;0m"
-		BOLD="\e[1;1m"
-		BLUE="${BOLD}\e[1;34m"
-		GREEN="${BOLD}\e[1;32m"
-		RED="${BOLD}\e[1;31m"
-		YELLOW="${BOLD}\e[1;33m"
-	fi
-fi
-readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
-
-plain() {
-	local mesg=$1; shift
-	printf "${BOLD}    ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg() {
-	local mesg=$1; shift
-	printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg2() {
-	local mesg=$1; shift
-	printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-warning() {
-	local mesg=$1; shift
-	printf "${YELLOW}==> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-error() {
-	local mesg=$1; shift
-	printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-stat_busy() {
-	local mesg=$1; shift
-	printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" >&2
-}
-
-stat_done() {
-	printf "${BOLD}done${ALL_OFF}\n" >&2
-}
-
-_setup_workdir=false
-setup_workdir() {
-	[[ -z $WORKDIR ]] && WORKDIR=$(mktemp -d --tmpdir "${0##*/}.XXXXXXXXXX")
-	_setup_workdir=true
-	trap 'trap_abort' INT QUIT TERM HUP
-	trap 'trap_exit' EXIT
-}
-
-cleanup() {
-	if [[ -n $WORKDIR ]] && $_setup_workdir; then
-		rm -rf "$WORKDIR"
-	fi
-	[[ -n $1 ]] && exit $1
-}
-
-abort() {
-	msg 'Aborting...'
-	cleanup 0
-}
-
-trap_abort() {
-	trap - EXIT INT QUIT TERM HUP
-	abort
-}
-
-trap_exit() {
-	trap - EXIT INT QUIT TERM HUP
-	cleanup
-}
-
-die() {
-	error "$*"
-	cleanup 1
-}
-
-##
-#  usage : in_array( $needle, $haystack )
-# return : 0 - found
-#          1 - not found
-##
-in_array() {
-	local needle=$1; shift
-	local item
-	for item in "$@"; do
-		[[ $item = $needle ]] && return 0 # Found
-	done
-	return 1 # Not Found
-}
-
-##
-#  usage : lock_open_write( $fd, $path, $wait_message )
-##
-lock_open_write() {
-	local fd=$1
-	local path=$2
-	local msg=$3
-
-	# Only reopen the FD if it wasn't handed to us
-	if [[ $(readlink -f /dev/fd/$fd) != "${path}.lock" ]]; then
-		mkdir -p "${path%/*}"
-		eval "exec $fd>${path}.lock"
-	fi
-
-	if ! flock -n $fd; then
-		stat_busy "$msg"
-		flock $fd
-		stat_done
-	fi
-}
-
-##
-#  usage : lock_open_read( $fd, $path, $wait_message )
-##
-lock_open_read() {
-	local fd=$1
-	local path=$2
-	local msg=$3
-
-	# Only reopen the FD if it wasn't handed to us
-	if [[ $(readlink -f /dev/fd/$fd) != "${path}.lock" ]]; then
-		mkdir -p "${path%/*}"
-		eval "exec $fd>${path}.lock"
-	fi
-
-	if ! flock -sn $fd; then
-		stat_busy "$msg"
-		flock -s $fd
-		stat_done
-	fi
-}
-
-
-##
-#  usage : lock_close( $fd )
-##
-lock_close() {
-	local fd=$1
-	eval "exec $fd>&-"
-}
-
-##
-#  usage : get_full_version( [$pkgname] )
-# return : full version spec, including epoch (if necessary), pkgver, pkgrel
-##
-get_full_version() {
-	# set defaults if they weren't specified in buildfile
-	pkgbase=${pkgbase:-${pkgname[0]}}
-	epoch=${epoch:-0}
-	if [[ -z $1 ]]; then
-		if [[ $epoch ]] && (( ! $epoch )); then
-			echo $pkgver-$pkgrel
-		else
-			echo $epoch:$pkgver-$pkgrel
-		fi
-	else
-		for i in pkgver pkgrel epoch; do
-			local indirect="${i}_override"
-			eval $(declare -f package_$1 | sed -n "s/\(^[[:space:]]*$i=\)/${i}_override=/p")
-			[[ -z ${!indirect} ]] && eval ${indirect}=\"${!i}\"
-		done
-		if (( ! $epoch_override )); then
-			echo $pkgver_override-$pkgrel_override
-		else
-			echo $epoch_override:$pkgver_override-$pkgrel_override
-		fi
-	fi
-}
-- 
cgit v1.2.3-54-g00ecf