Skip to content

Commit

Permalink
Misc: Move shared functions out of make-release.sh
Browse files Browse the repository at this point in the history
 - Move shared functions in make-release.sh to a separate file,
   functions.sh .

 - Add more comments to make-release.sh and functions.sh .
  • Loading branch information
richardgv committed Jan 11, 2015
1 parent e4ff1a5 commit 25b217f
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 33 deletions.
51 changes: 51 additions & 0 deletions functions.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#!/bin/bash

# Shared functions for various supporting scripts of compton
# Mostly copied from Gentoo gentoo-functions

GOOD=$'\e[32;01m'
WARN=$'\e[33;01m'
BAD=$'\e[31;01m'
HILITE=$'\e[36;01m'
BRACKET=$'\e[34;01m'
NORMAL=$'\e[0m'

# @FUNCTION: eerror
# @USAGE: [message]
# @DESCRIPTION:
# Show an error message.
eerror() {
echo -e "$@" | while read -r ; do
echo " $BAD*$NORMAL $REPLY" >&2
done
return 0
}

# @FUNCTION: einfo
# @USAGE: [message]
# @DESCRIPTION:
# Show a message.
einfo() {
echo -e "$@" | while read -r ; do
echo " $GOOD*$NORMAL $REPLY"
done
return 0
}

# @FUNCTION: die
# @USAGE:
# @DESCRIPTION:
# Print the call stack and the working directory, then quit the shell.
die() {
eerror "Call stack:"
(( n = ${#FUNCNAME[@]} - 1 ))
while (( n > 0 )); do
funcname=${FUNCNAME[$((n - 1))]}
sourcefile=$(basename ${BASH_SOURCE[${n}]})
lineno=${BASH_LINENO[$((n - 1))]}
eerror " ${sourcefile}:${lineno} - Called ${funcname}()"
(( n-- ))
done
eerror "Working directory: '$(pwd)'"
exit 1
}
36 changes: 3 additions & 33 deletions make-release.sh
Original file line number Diff line number Diff line change
@@ -1,39 +1,9 @@
#!/bin/bash

GOOD=$'\e[32;01m'
WARN=$'\e[33;01m'
BAD=$'\e[31;01m'
HILITE=$'\e[36;01m'
BRACKET=$'\e[34;01m'
NORMAL=$'\e[0m'
# Make a release source tarball containing pre-built documentation

eerror() {
echo -e "$@" | while read -r ; do
echo " $BAD*$NORMAL $RC_INDENTATION$REPLY" >&2
done
return 0
}

einfo() {
echo -e "$@" | while read -r ; do
echo " $GOOD*$NORMAL $REPLY"
done
return 0
}

die() {
eerror "Call stack:"
(( n = ${#FUNCNAME[@]} - 1 ))
while (( n > 0 )); do
funcname=${FUNCNAME[$((n - 1))]}
sourcefile=$(basename ${BASH_SOURCE[${n}]})
lineno=${BASH_LINENO[$((n - 1))]}
eerror " ${sourcefile}:${lineno} - Called ${funcname}()"
(( n-- ))
done
eerror "Working directory: '$(pwd)'"
exit 1
}
BASE_DIR=$(dirname "$0")
. "${BASE_DIR}/functions.sh"

main() {
TMP=/tmp
Expand Down

0 comments on commit 25b217f

Please sign in to comment.