[Lunar-commits] r19369 - in lunar/trunk: bin etc/lunar sbin usr/share/doc/lunar/core-documentation var/lib/lunar var/lib/lunar/functions var/lib/lunar/menu var/lib/lunar/plugins
Auke Kok
sofar at lunar-linux.org
Tue Mar 21 19:10:51 UTC 2006
Author: sofar
Date: 2006-03-21 19:10:49 +0000 (Tue, 21 Mar 2006)
New Revision: 19369
Modified:
lunar/trunk/bin/lvu
lunar/trunk/etc/lunar/config
lunar/trunk/sbin/lunar
lunar/trunk/usr/share/doc/lunar/core-documentation/etc_lunar_config.html
lunar/trunk/var/lib/lunar/functions/download.lunar
lunar/trunk/var/lib/lunar/functions/init.lunar
lunar/trunk/var/lib/lunar/functions/messages.lunar
lunar/trunk/var/lib/lunar/functions/misc.lunar
lunar/trunk/var/lib/lunar/functions/modules.lunar
lunar/trunk/var/lib/lunar/functions/sources.lunar
lunar/trunk/var/lib/lunar/menu/dmodule.menu
lunar/trunk/var/lib/lunar/menu/download.menu
lunar/trunk/var/lib/lunar/plugins/download-generic.plugin
lunar/trunk/var/lib/lunar/unset.sh
Log:
Do not use := but preferably :- since it is safer (doesn't modify the defaulted var). Also wipe GCCWRAPPERS from all references.
Modified: lunar/trunk/bin/lvu
===================================================================
--- lunar/trunk/bin/lvu 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/bin/lvu 2006-03-21 19:10:49 UTC (rev 19369)
@@ -376,7 +376,7 @@
follow_active_lin $MODULE
done
- DEFAULT_DELAY=${DEFAULT_DELAY:=60}
+ DEFAULT_DELAY=${DEFAULT_DELAY:-60}
while true ; do
if ! ACTIVE_MODULE=$(find_active_lin) ; then
Modified: lunar/trunk/etc/lunar/config
===================================================================
--- lunar/trunk/etc/lunar/config 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/etc/lunar/config 2006-03-21 19:10:49 UTC (rev 19369)
@@ -42,33 +42,32 @@
MODULE_INDEX=/var/state/lunar/module.index
INSTALL_CACHE=/var/cache/lunar
- SOURCE_CACHE=${SOURCE_CACHE:=/var/spool/lunar}
+ SOURCE_CACHE=${SOURCE_CACHE:-/var/spool/lunar}
# Override the following variables in /etc/lunar/local/config
# Or by exporting them before installing or removing.
- ARCHIVE=${ARCHIVE:=on}
- AUTOFIX=${AUTOFIX:=on}
- AUTOPRUNE=${AUTOPRUNE:=on}
- MAIL_REPORTS=${MAIL_REPORTS:=off}
- PRESERVE=${PRESERVE:=on}
- REAP=${REAP:=on}
- ADMIN=${ADMIN:=root}
- SOUND=${SOUND:=off}
- SUSTAIN=${SUSTAIN:=on}
- VIEW_REPORTS=${VIEW_REPORTS:=off}
- VOYEUR=${VOYEUR:=on}
- GARBAGE=${GARBAGE:=on}
- PROMPT_DELAY=${PROMPT_DELAY:=150}
- GCCWRAPPERS=${GCCWRAPPERS:=on}
- PROBE_EXPIRED=${PROBE_EXPIRED:=on}
- TMPFS=${TMPFS:=off}
+ ARCHIVE=${ARCHIVE:-on}
+ AUTOFIX=${AUTOFIX:-on}
+ AUTOPRUNE=${AUTOPRUNE:-on}
+ MAIL_REPORTS=${MAIL_REPORTS:-off}
+ PRESERVE=${PRESERVE:-on}
+ REAP=${REAP:-on}
+ ADMIN=${ADMIN:-root}
+ SOUND=${SOUND:-off}
+ SUSTAIN=${SUSTAIN:-on}
+ VIEW_REPORTS=${VIEW_REPORTS:-off}
+ VOYEUR=${VOYEUR:-on}
+ GARBAGE=${GARBAGE:-on}
+ PROMPT_DELAY=${PROMPT_DELAY:-150}
+ PROBE_EXPIRED=${PROBE_EXPIRED:-on}
+ TMPFS=${TMPFS:-off}
LUNAR_PRIORITY="+10"
- LDD_CHECK=${LDD_CHECK:=on}
- FIND_CHECK=${FIND_CHECK:=on}
- MD5SUM_CHECK=${MD5SUM_CHECK:=on}
- SYM_CHECK=${SYM_CHECK:=off}
+ LDD_CHECK=${LDD_CHECK:-on}
+ FIND_CHECK=${FIND_CHECK:-on}
+ MD5SUM_CHECK=${MD5SUM_CHECK:-on}
+ SYM_CHECK=${SYM_CHECK:-off}
GNU_URL=ftp://ftp.gnu.org/pub/gnu
KDE_URL=ftp://ftp.kde.org/pub/kde
@@ -85,7 +84,7 @@
TRACKED="/bin /boot /etc /lib /sbin /usr /var /opt/lunar"
- TMPDIR=${TMPDIR:=/tmp}
+ TMPDIR=${TMPDIR:-/tmp}
DEFAULT="\e[0m"
BOLD="\e[1m"
Modified: lunar/trunk/sbin/lunar
===================================================================
--- lunar/trunk/sbin/lunar 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/sbin/lunar 2006-03-21 19:10:49 UTC (rev 19369)
@@ -511,20 +511,20 @@
X_HELP="When using --probe, also recompile modules if a newer version is available?"
Z_HELP="Custom modules in zlocal override equally named ones (NOT RECOMMENDED) ?"
- ARCHIVE=${ARCHIVE:=on}
- AUTORESURRECT=${AUTORESURRECT:=on}
- AUTOFIX=${AUTOFIX:=on}
- AUTOPRUNE=${AUTOPRUNE:=off}
- COLOR=${COLOR:=on}
- KEEP_SOURCE=${KEEP_SOURCE:=off}
- MAIL_REPORTS=${MAIL_REPORTS:=off}
- VIEW_REPORTS=${VIEW_REPORTS:=off}
- PRESERVE=${PRESERVE:=on}
- SOUND=${SOUND:=off}
+ ARCHIVE=${ARCHIVE:-on}
+ AUTORESURRECT=${AUTORESURRECT:-on}
+ AUTOFIX=${AUTOFIX:-on}
+ AUTOPRUNE=${AUTOPRUNE:-off}
+ COLOR=${COLOR:-on}
+ KEEP_SOURCE=${KEEP_SOURCE:-off}
+ MAIL_REPORTS=${MAIL_REPORTS:-off}
+ VIEW_REPORTS=${VIEW_REPORTS:-off}
+ PRESERVE=${PRESERVE:-on}
+ SOUND=${SOUND:-off}
SUSTAIN=${SUSTAIN:on}
- VOYEUR=${VOYEUR:=on}
- REAP=${REAP:=on}
- GARBAGE=${GARBAGE:=on}
+ VOYEUR=${VOYEUR:-on}
+ REAP=${REAP:-on}
+ GARBAGE=${GARBAGE:-on}
VERBOSE=${VERBOSE:off}
if [ -z $TMPFS ]; then
@@ -789,7 +789,7 @@
export IFS="$TAB_ENTER_IFS"
- LUNAR_MODULE=${LUNAR_MODULE:=lunar}
+ LUNAR_MODULE=${LUNAR_MODULE:-lunar}
LUNAR_VERSION=$(run_details $LUNAR_MODULE && echo $UPDATED)
main_menu
Modified: lunar/trunk/usr/share/doc/lunar/core-documentation/etc_lunar_config.html
===================================================================
--- lunar/trunk/usr/share/doc/lunar/core-documentation/etc_lunar_config.html 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/usr/share/doc/lunar/core-documentation/etc_lunar_config.html 2006-03-21 19:10:49 UTC (rev 19369)
@@ -300,7 +300,6 @@
VOYEUR=${VOYEUR:=on}<br>
GARBAGE=${GARBAGE:=on}<br>
PROMPT_DELAY=${PROMPT_DELAY:=150}<br>
-GCCWRAPPERS=${GCCWRAPPERS:=on}<br>
LUNAR_PRIORITY="+10"<br>
MAX_SOURCES=100<br>
LDD_CHECK=${LDD_CHECK:=on}<br>
Modified: lunar/trunk/var/lib/lunar/functions/download.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/download.lunar 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/var/lib/lunar/functions/download.lunar 2006-03-21 19:10:49 UTC (rev 19369)
@@ -64,7 +64,7 @@
return 1
fi
- MAX_SOURCES=${MAX_SOURCES:=100}
+ MAX_SOURCES=${MAX_SOURCES:-100}
# loop over all sources
for (( N = 0 ; N < MAX_SOURCES ; N++ )) ; do
Modified: lunar/trunk/var/lib/lunar/functions/init.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/init.lunar 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/var/lib/lunar/functions/init.lunar 2006-03-21 19:10:49 UTC (rev 19369)
@@ -59,7 +59,7 @@
# purpose : force niceness on lunar's processes
set_priority() {
debug_msg "set_priority ($@)"
- LUNAR_PRIORITY=${LUNAR_PRIORITY:="+10"}
+ LUNAR_PRIORITY=${LUNAR_PRIORITY:-"+10"}
renice "$LUNAR_PRIORITY" -p $$ 2> /dev/null >/dev/null
}
Modified: lunar/trunk/var/lib/lunar/functions/messages.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/messages.lunar 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/var/lib/lunar/functions/messages.lunar 2006-03-21 19:10:49 UTC (rev 19369)
@@ -145,7 +145,7 @@
echo -e -n "${QUERY_COLOR}$1 [$2] ${DEFAULT_COLOR}"
read -t $PROMPT_DELAY -n 1 RESPONSE
if [ -z "$RESPONSE" ]; then
- RESPONSE=${RESPONSE:=$2}
+ RESPONSE=${RESPONSE:-$2}
else
echo
fi
Modified: lunar/trunk/var/lib/lunar/functions/misc.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/misc.lunar 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/var/lib/lunar/functions/misc.lunar 2006-03-21 19:10:49 UTC (rev 19369)
@@ -146,7 +146,7 @@
custom_filters()
{
local FILE
- if [[ "${COMPRESS_MANPAGES:=on}" == "on" ]]; then
+ if [[ "${COMPRESS_MANPAGES:-on}" == "on" ]]; then
while read FILE; do
if [[ -f "$FILE" ]] ; then
if echo "$FILE" | grep '^/usr/share/man/.*\..$' | grep -q -v '\.gz$'; then
Modified: lunar/trunk/var/lib/lunar/functions/modules.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/modules.lunar 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/var/lib/lunar/functions/modules.lunar 2006-03-21 19:10:49 UTC (rev 19369)
@@ -164,7 +164,7 @@
local SECTION SECTIONS
debug_msg "find_section ($@)"
- if [[ "${ZLOCAL_OVERRIDES:=off}" == "on" ]] ; then
+ if [[ "${ZLOCAL_OVERRIDES:-off}" == "on" ]] ; then
if SECTION=$(find "$MOONBASE/zlocal/" -type d -name $1 | sed -e "s|$MOONBASE/||;s|/$1$||" ) ; then
if [[ -n "$SECTION" ]]; then
echo $SECTION
Modified: lunar/trunk/var/lib/lunar/functions/sources.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/sources.lunar 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/var/lib/lunar/functions/sources.lunar 2006-03-21 19:10:49 UTC (rev 19369)
@@ -40,7 +40,7 @@
sources() {
(
debug_msg "sources ($@)"
- MAX_SOURCES=${MAX_SOURCES:=100}
+ MAX_SOURCES=${MAX_SOURCES:-100}
if ! run_details $1 ; then
return 1
@@ -96,7 +96,7 @@
verify_all_sources() {
(
debug_msg "verify_all_sources ($@)"
- MAX_SOURCES=${MAX_SOURCES:=100}
+ MAX_SOURCES=${MAX_SOURCES:-100}
if ! run_details $1 ; then
return 1
@@ -170,7 +170,7 @@
cd $BUILD_DIRECTORY
DEAD_DIR=$1
- DEAD_DIR=${DEAD_DIR:=$SOURCE_DIRECTORY}
+ DEAD_DIR=${DEAD_DIR:-$SOURCE_DIRECTORY}
verbose_msg "destroying building dir \"$DEAD_DIR\""
if [ "$TMPFS" != "off" ] ; then
@@ -193,7 +193,7 @@
fi
cd "$BUILD_DIRECTORY"
NEW_DIR=$1
- NEW_DIR=${NEW_DIR:=$SOURCE_DIRECTORY}
+ NEW_DIR=${NEW_DIR:-$SOURCE_DIRECTORY}
verbose_msg "creating building dir \"$NEW_DIR\""
if [ "$TMPFS" != "off" ] ; then
Modified: lunar/trunk/var/lib/lunar/menu/dmodule.menu
===================================================================
--- lunar/trunk/var/lib/lunar/menu/dmodule.menu 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/var/lib/lunar/menu/dmodule.menu 2006-03-21 19:10:49 UTC (rev 19369)
@@ -32,8 +32,8 @@
some common criteria. Better do not hack by yourself."
LUNAR_MODULES=$(echo "$LUNAR_MODULES" | tr " " "\t")
- LUNAR_MODULES=${LUNAR_MODULES:=lunar}
- LUNAR_MODULE=${LUNAR_MODULE:=lunar}
+ LUNAR_MODULES=${LUNAR_MODULES:-lunar}
+ LUNAR_MODULE=${LUNAR_MODULE:-lunar}
unset SDM
for LUNAR in $LUNAR_MODULES ; do
Modified: lunar/trunk/var/lib/lunar/menu/download.menu
===================================================================
--- lunar/trunk/var/lib/lunar/menu/download.menu 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/var/lib/lunar/menu/download.menu 2006-03-21 19:10:49 UTC (rev 19369)
@@ -140,8 +140,8 @@
This option can also be set per module basis. Add
FTP_ACTIVE=on in DETAILS file :=) or vice-versa."
- FTP_ACTIVE=${FTP_ACTIVE:=off}
- FTP_PASSIVE=${FTP_PASSIVE:=on}
+ FTP_ACTIVE=${FTP_ACTIVE:-off}
+ FTP_PASSIVE=${FTP_PASSIVE:-on}
[ "$FTP_ACTIVE" == "on" ] &&
FTP_PASSIVE=off ||
@@ -176,7 +176,7 @@
This option can also be set per module basis. Add
CONTINUE=off in DETAILS file :=) or vice-versa."
- CONTINUE=${CONTINUE:=on}
+ CONTINUE=${CONTINUE:-on}
PARTIAL=`$DIALOG --title "Partial Downloads" \
--ok-label "Commit" \
@@ -207,7 +207,7 @@
This option can also be set per module basis. Add
USE_CACHE=off in DETAILS file :=) or vice-versa."
- USE_CACHE=${USE_CACHE:=on}
+ USE_CACHE=${USE_CACHE:-on}
CACHE=`$DIALOG --title "Cache Usage" \
--ok-label "Commit" \
@@ -236,7 +236,7 @@
This option can also be set per module basis. Add
NUM_RETRY=<n> in DETAILS file :=)"
- NUM_RETRY=${NUM_RETRY:=5}
+ NUM_RETRY=${NUM_RETRY:-5}
if NUM_RETRY=`$DIALOG --title "Number of Retries" \
--ok-label "Commit" \
@@ -257,7 +257,7 @@
should be reported to maintainer at lunar-linux.org.
"
- EXHAUSTIVE=${EXHAUSTIVE:=off}
+ EXHAUSTIVE=${EXHAUSTIVE:-off}
EXHAUSTIVE=`$DIALOG --title "Exhaustive mirror testing: " \
--ok-label "Commit" \
Modified: lunar/trunk/var/lib/lunar/plugins/download-generic.plugin
===================================================================
--- lunar/trunk/var/lib/lunar/plugins/download-generic.plugin 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/var/lib/lunar/plugins/download-generic.plugin 2006-03-21 19:10:49 UTC (rev 19369)
@@ -46,7 +46,7 @@
WGET_RATE="--limit-rate=${DOWNLOAD_RATE}"
fi
- WGET_RETRIES="--tries=${NUM_RETRY:=5}"
+ WGET_RETRIES="--tries=${NUM_RETRY:-5}"
[ -n "$http_proxy" ] && export http_proxy=$http_proxy
[ -n "$ftp_proxy" ] && export ftp_proxy=$ftp_proxy
Modified: lunar/trunk/var/lib/lunar/unset.sh
===================================================================
--- lunar/trunk/var/lib/lunar/unset.sh 2006-03-21 16:38:24 UTC (rev 19368)
+++ lunar/trunk/var/lib/lunar/unset.sh 2006-03-21 19:10:49 UTC (rev 19369)
@@ -32,8 +32,6 @@
unset FTP_ACTIVE
unset FUNCTIONS
unset GARBAGE
-unset GCCVER
-unset GCCWRAPPERS
unset GNOME_URL
unset GNU_URL
unset GREEN
More information about the Lunar-commits
mailing list