[Lunar-commits] r21832 - in lunar/branches/stable: etc/lunar var/lib/lunar var/lib/lunar/functions var/lib/lunar/menu var/lib/lunar/plugins
Auke Kok
sofar at lunar-linux.org
Mon Oct 16 19:32:56 UTC 2006
Author: sofar
Date: 2006-10-16 19:32:56 +0000 (Mon, 16 Oct 2006)
New Revision: 21832
Modified:
lunar/branches/stable/etc/lunar/config
lunar/branches/stable/var/lib/lunar/functions/misc.lunar
lunar/branches/stable/var/lib/lunar/menu/mirrors.menu
lunar/branches/stable/var/lib/lunar/plugins/download-generic.plugin
lunar/branches/stable/var/lib/lunar/unset.sh
Log:
Merge from theedge:
- XOrg url
- wget OPTS change
- last_kernel() function
Modified: lunar/branches/stable/etc/lunar/config
===================================================================
--- lunar/branches/stable/etc/lunar/config 2006-10-16 19:27:12 UTC (rev 21831)
+++ lunar/branches/stable/etc/lunar/config 2006-10-16 19:32:56 UTC (rev 21832)
@@ -75,6 +75,7 @@
KERNEL_URL=ftp://ftp.kernel.org
SFORGE_URL=http://osdn.dl.sourceforge.net/sourceforge
XFREE86_URL=ftp://ftp.xfree86.org/pub/XFree86
+ XORG_URL=ftp://ftp.freedesktop.org/pub/xorg
LRESORT_URL=http://download.lunar-linux.org/lunar/cache
MOONBASE_URL[0]=http://lunar-linux.org/lunar/
Modified: lunar/branches/stable/var/lib/lunar/functions/misc.lunar
===================================================================
--- lunar/branches/stable/var/lib/lunar/functions/misc.lunar 2006-10-16 19:27:12 UTC (rev 21831)
+++ lunar/branches/stable/var/lib/lunar/functions/misc.lunar 2006-10-16 19:32:56 UTC (rev 21832)
@@ -172,3 +172,13 @@
{
echo $1 | sed 's/.tar.\(bz2\|gz\)$//g'
}
+
+
+last_kernel()
+{
+ if [ -f /usr/src/linux/include/linux/utsrelease.h ]; then
+ grep UTS_RELEASE /usr/src/linux/include/linux/utsrelease.h | cut -d'"' -f2
+ else
+ grep UTS_RELEASE /usr/src/linux/include/linux/version.h | cut -d'"' -f2
+ fi
+}
Modified: lunar/branches/stable/var/lib/lunar/menu/mirrors.menu
===================================================================
--- lunar/branches/stable/var/lib/lunar/menu/mirrors.menu 2006-10-16 19:27:12 UTC (rev 21831)
+++ lunar/branches/stable/var/lib/lunar/menu/mirrors.menu 2006-10-16 19:32:56 UTC (rev 21832)
@@ -26,7 +26,7 @@
--ok-label "Select" \
--menu \
"" \
- 0 70 10 \
+ 0 80 10 \
$(mirror_list $1)
}
@@ -39,20 +39,22 @@
SF_HELP="Select mirror for downloading SourceForge sources."
LR_HELP="Select the mirror for a last resort download place."
X_HELP="Select mirror for downloading XFree86 related sources."
+ XORG_HELP="Select mirror for downloading XOrg related sources."
HELP="Selecting a mirror site can speed your downloads."
- COMMAND=`$DIALOG --title "Mirror Menu" \
- --ok-label "Select" \
- --cancel-label "Exit" \
- --item-help \
- --menu "" 0 0 0 \
- "GNOME" "" "$N_HELP" \
- "GNU" "" "$G_HELP" \
- "KDE" "" "$K_HELP" \
- "KERNEL" "" "$L_HELP" \
- "SFORGE" "" "$SF_HELP" \
- "LRESORT" "" "$LR_HELP" \
- "XFREE86" "" "$X_HELP"`
+ COMMAND=`$DIALOG --title "Mirror Menu" \
+ --ok-label "Select" \
+ --cancel-label "Exit" \
+ --item-help \
+ --menu "" 0 0 0 \
+ "GNOME" "" "$N_HELP" \
+ "GNU" "" "$G_HELP" \
+ "KDE" "" "$K_HELP" \
+ "KERNEL" "" "$L_HELP" \
+ "SFORGE" "" "$SF_HELP" \
+ "LRESORT" "" "$LR_HELP" \
+ "XFREE86" "" "$X_HELP" \
+ "XORG" "" "$XORG_HELP"`
do
case $COMMAND in
@@ -61,6 +63,7 @@
KDE) MIRROR=" KDE_URL" ;;
KERNEL) MIRROR=" KERNEL_URL" ;;
XFREE86) MIRROR=" XFREE86_URL" ;;
+ XORG) MIRROR=" XORG_URL" ;;
SFORGE) MIRROR=" SFORGE_URL" ;;
LRESORT) MIRROR=" LRESORT_URL" ;;
esac
Modified: lunar/branches/stable/var/lib/lunar/plugins/download-generic.plugin
===================================================================
--- lunar/branches/stable/var/lib/lunar/plugins/download-generic.plugin 2006-10-16 19:27:12 UTC (rev 21831)
+++ lunar/branches/stable/var/lib/lunar/plugins/download-generic.plugin 2006-10-16 19:32:56 UTC (rev 21832)
@@ -27,33 +27,37 @@
TMP_FILE=$TMPDIR/$2
if [ "$FTP_ACTIVE" == "off" -o "$FTP_PASSIVE" == "on" ] ; then
- WGET_FTP_CONNECTION="--passive-ftp"
+ WGET_OPTS+=" --passive-ftp"
fi
if [ "$CONTINUE" == "off" ] ; then
erase $TMP_FILE
else
- WGET_PARTIAL="--continue"
+ WGET_OPTS+=" --continue"
fi
if [ "$USE_CACHE" == "off" ] ; then
- WGET_CACHE="--cache=off"
+ WGET_OPTS+=" --cache=off"
else
- WGET_CACHE="--cache=on"
+ WGET_OPTS+=" --cache=on"
fi
if [ -n "$DOWNLOAD_RATE" ] ; then
- WGET_RATE="--limit-rate=${DOWNLOAD_RATE}"
+ WGET_OPTS+=" --limit-rate=${DOWNLOAD_RATE}"
fi
- WGET_RETRIES="--tries=${NUM_RETRY:-5}"
+ if [ ${1:0:8} == "https://" ]; then
+ WGET_OPTS+=" --no-check-certificate"
+ fi
+ WGET_OPTS+=" --tries=${NUM_RETRY:-5}"
+
[ -n "$http_proxy" ] && export http_proxy=$http_proxy
[ -n "$ftp_proxy" ] && export ftp_proxy=$ftp_proxy
[ -n "$no_proxy" ] && export no_proxy=$no_proxy
- verbose_msg "calling \"wget $WGET_CACHE $WGET_RATE $WGET_FTP_CONNECTION $WGET_RETRIES $WGET_PARTIAL \"$URL$2\" --output-document $TMP_FILE\""
- if erase $TMP_FILE && wget $WGET_CACHE $WGET_RATE $WGET_FTP_CONNECTION $WGET_RETRIES $WGET_PARTIAL "$URL$2" --output-document "$TMP_FILE" ; then
+ verbose_msg "calling \"wget $WGET_OPTS \"$URL$2\" --output-document $TMP_FILE\""
+ if erase $TMP_FILE && wget $WGET_OPTS "$URL$2" --output-document "$TMP_FILE" ; then
# looks like it worked
if testpack $TMP_FILE ; then
if [ "$TMP_FILE" != "$3/$2" ]; then
Modified: lunar/branches/stable/var/lib/lunar/unset.sh
===================================================================
--- lunar/branches/stable/var/lib/lunar/unset.sh 2006-10-16 19:27:12 UTC (rev 21831)
+++ lunar/branches/stable/var/lib/lunar/unset.sh 2006-10-16 19:32:56 UTC (rev 21832)
@@ -97,5 +97,6 @@
unset VOYEUR
unset WHITE
unset XFREE86_URL
+unset XORG_URL
unset XTRA
unset YELLOW
More information about the Lunar-commits
mailing list