|
|
|
@ -582,13 +582,25 @@ log(){
|
|
|
|
|
|
|
|
|
|
|
|
debug_mode(){
|
|
|
|
debug_mode(){
|
|
|
|
if [[ $(cmdline_parameter debug) || ${DEBUGMODE} == "yes" ]]; then
|
|
|
|
if [[ $(cmdline_parameter debug) || ${DEBUGMODE} == "yes" ]]; then
|
|
|
|
[[ -n ${SELF_FILE} && -n ${SELF_NAME} ]] || { local SELF_FILE=$0; local SELF_NAME=${0##*/}; }
|
|
|
|
|
|
|
|
[[ ${PWD} == "/union" ]] && local ROOTFS="." || local ROOTFS=
|
|
|
|
[[ ${PWD} == "/union" ]] && local ROOTFS="." || local ROOTFS=
|
|
|
|
if [[ ! -f ${ROOTFS}/var/log/ublinux/${SELF_NAME}.log ]]; then
|
|
|
|
local PATH_LOG="${ROOTFS}/var/log/ublinux"
|
|
|
|
|
|
|
|
[[ -z ${ROOTFS} && ${EUID:-0} -ne 0 ]] && PATH_LOG="${HOME}/.ublinux/log"
|
|
|
|
|
|
|
|
[[ -d ${PATH_LOG} ]] || mkdir -p "${PATH_LOG}"
|
|
|
|
|
|
|
|
if [[ -z ${SELF_FILE} && -n $1 && -e $1 ]]; then
|
|
|
|
|
|
|
|
SELF_FILE=$1 && SELF_NAME=${1##*/} && SELF_PATH=${1%/*}
|
|
|
|
|
|
|
|
elif [[ -z ${SELF_FILE} && -n ${SSC_ARGV0} && -e ${SSC_ARGV0} ]]; then
|
|
|
|
|
|
|
|
SELF_FILE=${SSC_ARGV0} && SELF_NAME=${SSC_ARGV0##*/} && SELF_PATH=${SSC_ARGV0%/*}
|
|
|
|
|
|
|
|
elif [[ -z ${SELF_FILE} && -n $0 && -e $0 && ! $0 =~ ^"/dev/".* ]]; then
|
|
|
|
|
|
|
|
SELF_FILE=${0} && SELF_NAME=${0##*/} && SELF_PATH=${0%/*}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
SELF_FILE="unknown" && SELF_NAME="unknown" && SELF_PATH="unknown"
|
|
|
|
|
|
|
|
echo "$0 $@" >> "${PATH_LOG}/${SELF_NAME}.log"
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [[ ! -f "${PATH_LOG}/${SELF_NAME}.log" ]]; then
|
|
|
|
echo "${SELF_NAME} -- debug mode enabled"
|
|
|
|
echo "${SELF_NAME} -- debug mode enabled"
|
|
|
|
[[ -d ${ROOTFS}/var/log/ublinux ]] || mkdir -p ${ROOTFS}/var/log/ublinux
|
|
|
|
echo $(date) > "${PATH_LOG}/${SELF_NAME}.log" || echo "ERROR: Can not create log file"
|
|
|
|
echo $(date) > ${ROOTFS}/var/log/ublinux/${SELF_NAME}.log || echo "ERROR: Can not create log file"
|
|
|
|
shift
|
|
|
|
${SELF_FILE} "$@" 2>&1 | tee -a ${ROOTFS}/var/log/ublinux/${SELF_NAME}.log
|
|
|
|
${SELF_FILE} "$@" 2>&1 | tee -a "${PATH_LOG}/${SELF_NAME}.log"
|
|
|
|
exit 0
|
|
|
|
exit 0
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
@ -1072,8 +1084,9 @@ ubconfig_exec_system(){
|
|
|
|
[[ -d ${SSC_EXTRACT_DIR} ]] && rm -rf "${SSC_EXTRACT_DIR}"
|
|
|
|
[[ -d ${SSC_EXTRACT_DIR} ]] && rm -rf "${SSC_EXTRACT_DIR}"
|
|
|
|
[[ -n ${SSC_ARGV0} ]] && { [[ -f /usr/bin/bash ]] && /usr/bin/bash --version | grep -q ^"GNU bash" || exit 1; }
|
|
|
|
[[ -n ${SSC_ARGV0} ]] && { [[ -f /usr/bin/bash ]] && /usr/bin/bash --version | grep -q ^"GNU bash" || exit 1; }
|
|
|
|
[[ -z ${SELF_FILE} ]] && [[ -n ${SSC_ARGV0} ]] && SELF_FILE=${SSC_ARGV0} && SELF_NAME=${SSC_ARGV0##*/} && SELF_PATH=${SSC_ARGV0%/*} || { SELF_FILE=${0} && SELF_NAME=${0##*/} && SELF_PATH=${0%/*}; }
|
|
|
|
[[ -z ${SELF_FILE} ]] && [[ -n ${SSC_ARGV0} ]] && SELF_FILE=${SSC_ARGV0} && SELF_NAME=${SSC_ARGV0##*/} && SELF_PATH=${SSC_ARGV0%/*} || { SELF_FILE=${0} && SELF_NAME=${0##*/} && SELF_PATH=${0%/*}; }
|
|
|
|
|
|
|
|
|
|
|
|
[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; }
|
|
|
|
[[ ! -f /init ]] && { ROOTFS= ; CMD_CHROOT= ; } || { [[ -d /sysroot ]] && ROOTFS="/sysroot" || ROOTFS="."; CMD_CHROOT="chroot ${ROOTFS}"; }
|
|
|
|
SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
|
|
|
|
SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
|
|
|
|
SYSCONF="${ROOTFS}${SYSCONF}"
|
|
|
|
SYSCONF="${ROOTFS}${SYSCONF}"
|
|
|
|
|
|
|
|
|
|
|
|
#export TEXTDOMAINDIR="${ROOTFS}/usr/share/locale"
|
|
|
|
#export TEXTDOMAINDIR="${ROOTFS}/usr/share/locale"
|
|
|
|
|
