shift around some stuff in configure

parent 3fcaf097
......@@ -5,16 +5,19 @@ CODENAME="Sonic Empire"
ERR_MSG=""
if [[ ! $GIRPATH ]]; then
if [[ -d "/usr/lib/girepository-1.0/" ]]; then
export GIRPATH="/usr/lib/girepository-1.0/"
elif [[ -d "/usr/lib64/girepository-1.0/" ]]; then
export GIRPATH="/usr/lib64/girepository-1.0/"
else
echo *** GIRPATH not detected ***
fi
if [[ -d "/usr/lib/girepository-1.0/" ]]; then
export GIRPATH="/usr/lib/girepository-1.0/"
elif [[ -d "/usr/lib64/girepository-1.0/" ]]; then
export GIRPATH="/usr/lib64/girepository-1.0/"
else
echo *** GIRPATH not detected ***
fi
PREFIX="/usr"
DIRINFO_ENABLE="false"
MODE=user
PYTHON=$(which python)
export OLDPATH=$PATH
export PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin"
......
......@@ -4,6 +4,7 @@ IN_FILES=( rc/nx-rc data/bashstyle data/bashstyle-ng.pc data/bashstyle.sh )
SUB_VERSION_FILES=( data/bashstyle-ng.pc rc/nx-rc data/bashstyle )
SUB_PREFIX_FILES=( data/bashstyle-ng.pc data/bashstyle data/bashstyle.sh rc/nx-rc )
SUB_PY_FILES=( )
copy_in_files () {
......@@ -18,5 +19,6 @@ substitute_values () {
sed -e "s>@VERSION@>$xVERSION>g" -i ${SUB_VERSION_FILES[@]}
sed -e "s>@PREFIX@>$PREFIX>g" -i ${SUB_PREFIX_FILES[@]}
sed -e "s>@DIRINFO_ENABLE@>$DIRINFO_ENABLE>g" -i data/bashstyle.sh
sed -e "s>@PYTHON@>$PYTHON>g" -i ${SUB_PY_FILES[@]}
}
......@@ -37,7 +37,7 @@ while [[ $xcount -lt $pcount ]]; do
;;
*help )
MODE=HELP
MODE=help
;;
esac
shift
......@@ -46,23 +46,11 @@ done
unset xcount pcount
if [[ ! $PREFIX ]]; then
PREFIX="/usr"
fi
if [[ ! $DIRINFO_ENABLE ]]; then
DIRINFO_ENABLE="false"
fi
if [[ ! $MODE ]]; then
MODE=USER
fi
if [[ $MODE == HELP ]]; then
if [[ $MODE == help ]]; then
help_message
elif [[ $MODE == MAINTAINER ]]; then
elif [[ $MODE == maintainer ]]; then
maintainer_message
copy_in_files
......@@ -70,7 +58,7 @@ elif [[ $MODE == MAINTAINER ]]; then
end_message
export_result
elif [[ $MODE == USER ]]; then
elif [[ $MODE == user ]]; then
start_message
check_apps
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment