userinstall

Changeset

79:4f1585450740
2015-01-15 Paul Boddie raw files shortlog changelog graph Attempt to provide suitable repository definitions for multistrapped systems.
user-postsetup (file)
     1.1 --- a/user-postsetup	Thu Jan 15 21:25:08 2015 +0100
     1.2 +++ b/user-postsetup	Thu Jan 15 21:26:32 2015 +0100
     1.3 @@ -1,6 +1,6 @@
     1.4  #!/bin/sh
     1.5  
     1.6 -# Copyright (C) 2010, 2011, 2012, 2013 Paul Boddie <paul@boddie.org.uk>
     1.7 +# Copyright (C) 2010, 2011, 2012, 2013, 2014 Paul Boddie <paul@boddie.org.uk>
     1.8  #
     1.9  # This program is free software; you can redistribute it and/or modify it under
    1.10  # the terms of the GNU General Public License as published by the Free Software
    1.11 @@ -59,9 +59,10 @@
    1.12  if [ "$USERINSTALL_CODENAME" = "$DISTRIB_CODENAME" ]; then
    1.13          $AS_USER cp /etc/apt/sources.list "$PACKAGEROOT/etc/apt/"
    1.14  
    1.15 -# Otherwise, attempt to make a new sources list.
    1.16 +# Otherwise, attempt to make a new sources list, if necessary.
    1.17  
    1.18 -else
    1.19 +elif [ ! -e "$PACKAGEROOT/etc/apt/sources.list.d/multistrap-"*".list" ]; then
    1.20 +
    1.21  	echo "Attempting to generate a repository definition for $USERINSTALL_CODENAME." 1>&2
    1.22  	$AS_USER USERINSTALL_ID="$USERINSTALL_ID" USERINSTALL_CODENAME="$USERINSTALL_CODENAME" \
    1.23  		"$THIS_DIR/user-makesources" "$PACKAGEROOT/etc/apt/sources.list" "$COUNTRY"