avatar
tpg has added cb7f2865f1
minor cleans
view file @ cb7f2865f1
... ... --- a/omdv-build-iso.sh
... ... +++ b/omdv-build-iso.sh
... ... @@ -178,17 +178,17 @@ if [ "`id -u`" != "0" ]; then
178 178
    exit 1
179 179
fi
180 180
181
# check whether script is executed inside ABF (www.abf.io)
181
# check whether script is executed inside ABF (https://abf.openmandriva.org)
182 182
if [ "$ABF" == "1" ]; then
183 183
    IN_ABF=1
184
    echo "We are in ABF (www.abf.io) environment"
184
    echo "We are in ABF (https://abf.openmandriva.org) environment"
185 185
    if [ -n "$NOCLEAN" ]; then
186
	echo "You cannot use --noclean inside ABF (www.abf.io)"
186
	echo "You cannot use --noclean inside ABF (https://abf.openmandriva.org)"
187 187
	exit 1
188 188
    fi
189 189
190 190
    if [ -n "$WORKDIR" ]; then
191
	echo "You cannot use --workdir inside ABF (www.abf.io)"
191
	echo "You cannot use --workdir inside ABF (https://abf.openmandriva.org)"
192 192
	exit 1
193 193
    fi
194 194
... ... @@ -332,10 +332,9 @@ updateSystem() {
332 332
333 333
    # Force update of critical packages
334 334
    if [ -n "$IN_ABF" ]; then
335
	echo "We are inside ABF (www.abf.io). Updating packages."
335
	echo "We are inside ABF (https://abf.openmandriva.org). Updating packages."
336 336
	$SUDO urpmq --list-url
337 337
	$SUDO urpmi.update -ff updates
338
339 338
	# Inside ABF, lxc-container which is used to run this script is based
340 339
	# on Rosa2012 which does not have cdrtools
341 340
	# List of packages that needs to be installed inside lxc-container
... ... @@ -366,8 +365,8 @@ getPkgList() {
365 365
366 366
    if [ ! -d $WORKDIR/iso-pkg-lists-$BRANCH ]; then
367 367
	echo "Could not find $WORKDIR/iso-pkg-lists-$BRANCH. Downloading from ABF."
368
	# download iso packages lists from www.abf.io
369
	PKGLIST="https://abf.io/openmandriva/iso-pkg-lists/archive/iso-pkg-lists-$BRANCH.tar.gz"
368
	# download iso packages lists from https://abf.openmandriva.org
369
	PKGLIST="https://abf.openmandriva.org/openmandriva/iso-pkg-lists/archive/iso-pkg-lists-$BRANCH.tar.gz"
370 370
	$SUDO  wget --tries=10 -O `echo "$WORKDIR/iso-pkg-lists-$BRANCH.tar.gz"` --content-disposition $PKGLIST
371 371
	$SUDO tar zxfC $WORKDIR/iso-pkg-lists-$BRANCH.tar.gz $WORKDIR
372 372
	# Why not retain the unique list name it will help when people want their own spins ?
... ... @@ -432,9 +431,9 @@ createChroot() {
431 431
432 432
    # path to repository
433 433
    if [ "${TREE,,}" == "cooker" ]; then
434
	REPOPATH="http://abf-downloads.abf.io/$TREE/repository/$EXTARCH/"
434
	REPOPATH="http://abf-downloads.openmandriva.org/$TREE/repository/$EXTARCH/"
435 435
    else
436
	REPOPATH="http://abf-downloads.abf.io/$TREE/repository/$EXTARCH/"
436
	REPOPATH="http://abf-downloads.openmandriva.org/$TREE/repository/$EXTARCH/"
437 437
    fi
438 438
439 439
    echo "Creating chroot $CHROOTNAME"

Comments