View | Details | Raw Unified | Return to bug 8274
Collapse All | Expand All

(-)/usr/share/separator/functions- (-3 / +25 lines)
Lines 56-61 Link Here
56
}
56
}
57
57
58
58
59
copy_rpm()
60
{
61
    local SRC DST cachedir cachedfile
62
    SRC=$1
63
    DST=$2
64
    if [ "${CACHEDIR:0:1}" = "/" ]; then
65
	cachedir="$CACHEDIR"
66
    else
67
	cachedir="$WORKDIR/$CACHEDIR"
68
    fi
69
    if [ -z "$cachedir" ] || echo $i | egrep -qv '^(ftp|http):' ; then
70
	curl $SRC -q -s -o $DST || return 1
71
    else
72
	[ -d "$cachedir" ] || mkdir -p "$cachedir"
73
	cachedfile="$cachedir/`basename $SRC`"
74
	if [ ! -e "$cachedfile" ]; then
75
	    curl $SRC -q -s -o $cachedfile || return 1
76
	fi
77
	cp -fp $cachedfile $DST || return 1
78
    fi
79
}
80
59
init_root()
81
init_root()
60
{
82
{
61
    local TMPDIR ROOT LANGS
83
    local TMPDIR ROOT LANGS
Lines 73-79 Link Here
73
    export LC_ALL=POSIX LANG=POSIX LANGUAGE=POSIX
95
    export LC_ALL=POSIX LANG=POSIX LANGUAGE=POSIX
74
    
96
    
75
    for i in $packages;do
97
    for i in $packages;do
76
	if ! curl $i -q -s -o $ROOT/.in/`basename $i`;then 
98
	if ! copy_rpm $i $ROOT/.in/`basename $i`;then 
77
	    echo "Copy package `basename $i` failed !!!"
99
	    echo "Copy package `basename $i` failed !!!"
78
	    exit 1
100
	    exit 1
79
	fi
101
	fi
Lines 91-97 Link Here
91
    ROOT=$2
113
    ROOT=$2
92
    echo -n "getting packages for install "
114
    echo -n "getting packages for install "
93
    for i in `cat $packagesfile`;do
115
    for i in `cat $packagesfile`;do
94
	    if ! curl $i -qs -o $ROOT/.in/`basename $i`;then
116
	    if ! copy_rpm $i $ROOT/.in/`basename $i`;then
95
		echo "Copy package `basename $i` failed !!!"
117
		echo "Copy package `basename $i` failed !!!"
96
		exit 1
118
		exit 1
97
	    fi
119
	    fi
Lines 274-280 Link Here
274
    while read i
296
    while read i
275
    do
297
    do
276
	packagestatus "$INSTALLDIRS" `basename $i` $OUTDIR || continue
298
	packagestatus "$INSTALLDIRS" `basename $i` $OUTDIR || continue
277
	if ! curl $i -qs -o $INSTALLDIR/`basename $i`; then 
299
	if ! copy_rpm $i $INSTALLDIR/`basename $i`; then 
278
	    echo "Copy package $i to  $INSTALLDIR/`basename $i` failed !!!"
300
	    echo "Copy package $i to  $INSTALLDIR/`basename $i` failed !!!"
279
	    exit 1
301
	    exit 1
280
        fi
302
        fi

Return to bug 8274