Removed some superflous verbosity.
This commit is contained in:
parent
bc097cd133
commit
a110145fa5
1 changed files with 7 additions and 7 deletions
14
master.sh
14
master.sh
|
@ -431,6 +431,7 @@ if [ x$ANSWER != "xyes" ] ; then
|
||||||
echo "${nl_}Fix the configuration options and rerun the script.${nl_}"
|
echo "${nl_}Fix the configuration options and rerun the script.${nl_}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
echo "${nl_}---------------${nl_}"
|
||||||
|
|
||||||
# Prevents setting "-d /" by mistake.
|
# Prevents setting "-d /" by mistake.
|
||||||
|
|
||||||
|
@ -450,26 +451,25 @@ fi
|
||||||
clean_builddir
|
clean_builddir
|
||||||
|
|
||||||
if [[ ! -d $JHALFSDIR ]]; then
|
if [[ ! -d $JHALFSDIR ]]; then
|
||||||
mkdir -pv $JHALFSDIR
|
mkdir -p $JHALFSDIR
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$PWD" != "$JHALFSDIR" ]]; then
|
if [[ "$PWD" != "$JHALFSDIR" ]]; then
|
||||||
cp -v $COMMON_DIR/makefile-functions $JHALFSDIR/
|
cp $COMMON_DIR/makefile-functions $JHALFSDIR/
|
||||||
if [[ -n "$FILES" ]]; then
|
if [[ -n "$FILES" ]]; then
|
||||||
# pushd/popd necessary to deal with mulitiple files
|
# pushd/popd necessary to deal with mulitiple files
|
||||||
pushd $PACKAGE_DIR
|
pushd $PACKAGE_DIR 1> /dev/null
|
||||||
cp -v $FILES $JHALFSDIR/
|
cp $FILES $JHALFSDIR/
|
||||||
popd
|
popd 1> /dev/null
|
||||||
fi
|
fi
|
||||||
sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
|
sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
|
||||||
export XSL=$JHALFSDIR/${XSL}
|
export XSL=$JHALFSDIR/${XSL}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! -d $LOGDIR ]]; then
|
if [[ ! -d $LOGDIR ]]; then
|
||||||
mkdir -v $LOGDIR
|
mkdir $LOGDIR
|
||||||
fi
|
fi
|
||||||
>$LOGDIR/$LOG
|
>$LOGDIR/$LOG
|
||||||
echo "---------------${nl_}"
|
|
||||||
|
|
||||||
get_book
|
get_book
|
||||||
echo "---------------${nl_}"
|
echo "---------------${nl_}"
|
||||||
|
|
Reference in a new issue