Bugfix: Fixing faulty commit.
This commit is contained in:
parent
1c2f79c24b
commit
7293dfcc41
2 changed files with 14 additions and 6 deletions
|
@ -11,7 +11,7 @@ sit_info() {
|
||||||
|
|
||||||
sit_countdown() {
|
sit_countdown() {
|
||||||
local tt=$1
|
local tt=$1
|
||||||
for i in $(seq $tt); do
|
for i in $(seq $tt -1 1); do
|
||||||
echo -n "$i "
|
echo -n "$i "
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
18
sit
18
sit
|
@ -96,25 +96,32 @@ PREFIX_SUFFIX=$PREFIX_SUFFIX${PACKAGE_DESCRIPTOR}
|
||||||
|
|
||||||
|
|
||||||
PREFIX=$PREFIX${PREFIX_SUFFIX:+"$PREFIX_SUFFIX"}
|
PREFIX=$PREFIX${PREFIX_SUFFIX:+"$PREFIX_SUFFIX"}
|
||||||
echo "Installation PREFIX: $PREFIX"
|
|
||||||
|
|
||||||
# final working directory path
|
# final working directory path
|
||||||
WORKDIR=${WORKDIR_BASE}/${CATEGORY}/${PACKAGE}/${VERSION}$PREFIX_SUFFIX
|
WORKDIR=${WORKDIR_BASE}/${CATEGORY}/${PACKAGE}/${VERSION}$PREFIX_SUFFIX
|
||||||
echo "Working dir: $WORKDIR"
|
|
||||||
|
|
||||||
# path to the source code directory
|
# path to the source code directory
|
||||||
SRCDIR=${WORKDIR}/${P}
|
SRCDIR=${WORKDIR}/${P}
|
||||||
echo "Source dir: $SRCDIR"
|
|
||||||
|
|
||||||
# build directory (should be different from source directory):
|
# build directory (should be different from source directory):
|
||||||
BUILDDIR=${SRCDIR}/build
|
BUILDDIR=${SRCDIR}/build
|
||||||
echo "Build dir: $BUILDDIR"
|
|
||||||
|
|
||||||
# logfile directory
|
# logfile directory
|
||||||
LOGDIR=${WORKDIR}
|
LOGDIR=${WORKDIR}
|
||||||
|
|
||||||
|
|
||||||
|
# source the package class file a second time, so we can modify variables
|
||||||
|
# using their default values. (Defaults depend on other vairables in
|
||||||
|
# the class file like CATEGORY or PACKAGE)
|
||||||
|
source $SCLASS_DIR/$SCLASSFILE
|
||||||
|
|
||||||
|
echo "Installation PREFIX: $PREFIX"
|
||||||
|
echo "Working dir: $WORKDIR"
|
||||||
|
echo "Source dir: $SRCDIR"
|
||||||
|
echo "Build dir: $BUILDDIR"
|
||||||
echo "Logfile dir: $LOGDIR"
|
echo "Logfile dir: $LOGDIR"
|
||||||
|
|
||||||
sleep 2
|
sit_countdown 2
|
||||||
|
|
||||||
if [ -d ${WORKDIR} ] ; then
|
if [ -d ${WORKDIR} ] ; then
|
||||||
sit_info "Removing existing working directory ${WORKDIR}"
|
sit_info "Removing existing working directory ${WORKDIR}"
|
||||||
|
@ -124,6 +131,7 @@ fi
|
||||||
mkdir -p ${WORKDIR}
|
mkdir -p ${WORKDIR}
|
||||||
mkdir -p ${BUILDDIR}
|
mkdir -p ${BUILDDIR}
|
||||||
mkdir -p ${LOGDIR}
|
mkdir -p ${LOGDIR}
|
||||||
|
|
||||||
sit_unpack; 2>&1 | tee "$LOGDIR/unpack.log"; ( exit ${PIPESTATUS} )
|
sit_unpack; 2>&1 | tee "$LOGDIR/unpack.log"; ( exit ${PIPESTATUS} )
|
||||||
sit_configure 2>&1 | tee "$LOGDIR/configure.log"; ( exit ${PIPESTATUS} )
|
sit_configure 2>&1 | tee "$LOGDIR/configure.log"; ( exit ${PIPESTATUS} )
|
||||||
sit_build 2>&1 | tee "$LOGDIR/make.log"; ( exit ${PIPESTATUS} )
|
sit_build 2>&1 | tee "$LOGDIR/make.log"; ( exit ${PIPESTATUS} )
|
||||||
|
|
Loading…
Reference in a new issue