1.1 --- a/README.txt Tue Mar 17 00:13:50 2009 +0100
1.2 +++ b/README.txt Sat Jan 16 22:12:19 2010 +0100
1.3 @@ -29,12 +29,15 @@
1.4 fakeroot Tested with 1.5.10ubuntu2
1.5 fakechroot 2.8 or later required
1.6 debootstrap Tested with 0.3.3.2ubuntu3 on Ubuntu Hoary 5.04, 1.0.7~feisty1
1.7 - on Ubuntu Hoary 7.04
1.8 + on Ubuntu Feisty 7.04, 1.0.20~hardy1 on Ubuntu Hardy
1.9
1.10 New in userinstall 0.1.1 (Changes since userinstall 0.1)
1.11 --------------------------------------------------------
1.12
1.13 * Fixed an argument parsing error in the user-setup script.
1.14 + * Adopted lsb-release environment variables instead of new ones like
1.15 + DISTNAME.
1.16 + * Added explicit keyring package installation.
1.17
1.18 Configuration
1.19 -------------
1.20 @@ -42,15 +45,26 @@
1.21 If the system defaults are not to be used, or if userinstall is not installed
1.22 as a system package, the userinstall-defaults file supplied with the
1.23 distribution may be edited to specify the nature and location of the personal
1.24 -package manager. The following settings can be edited:
1.25 +package manager. After commenting out or removing this line...
1.26 +
1.27 +source /etc/lsb-release
1.28 +
1.29 +...the following settings can be edited:
1.30 +
1.31 +DISTRIB_ID This should reflect the distribution being used or, in
1.32 + special cases, a different distribution. Examples include
1.33 + Debian and Ubuntu.
1.34
1.35 -DISTNAME This should reflect the distribution being used and need only
1.36 - be altered in special situations. Note that the setup process
1.37 - may not work with different distributions due to library
1.38 - incompatibilities.
1.39 +DISTRIB_CODENAME This should reflect the version of the distribution being
1.40 + used and need only be altered in special situations (such as
1.41 + the creation of a sandbox for testing other distributions).
1.42 + Examples of codenames include hardy and jaunty for Ubuntu
1.43 + and lenny and squeeze for Debian. Note that the setup
1.44 + process may not work with different distributions due to
1.45 + library incompatibilities.
1.46
1.47 -PACKAGEROOT The location of the personal package manager in the
1.48 - filesystem.
1.49 +PACKAGEROOT The location of the personal package manager in the
1.50 + filesystem.
1.51
1.52 If a completely new userinstall-defaults file is created, it is essential that
1.53 the above variables be defined so that the scripts know where to create or to
2.1 --- a/user-setup Tue Mar 17 00:13:50 2009 +0100
2.2 +++ b/user-setup Sat Jan 16 22:12:19 2010 +0100
2.3 @@ -17,9 +17,13 @@
2.4 echo "Examples:"
2.5 echo
2.6 echo "user-setup"
2.7 - echo "user-setup file:///tmp/$DISTNAME/"
2.8 + echo "user-setup file:///tmp/$DISTRIB_CODENAME/"
2.9 echo "user-setup http://ftp.xx.debian.org/debian/"
2.10 exit 1
2.11 fi
2.12
2.13 -fakeroot fakechroot --use-system-libs debootstrap --variant=fakechroot --include=gnupg $DISTNAME $PACKAGEROOT $1
2.14 +fakeroot fakechroot --use-system-libs debootstrap --variant=fakechroot --include=gnupg,$KEYRING $DISTRIB_CODENAME $PACKAGEROOT $1
2.15 +echo
2.16 +echo "Don't forget to run the following before installing packages:"
2.17 +echo
2.18 +echo "apt-get update"
3.1 --- a/userinstall-defaults Tue Mar 17 00:13:50 2009 +0100
3.2 +++ b/userinstall-defaults Sat Jan 16 22:12:19 2010 +0100
3.3 @@ -4,5 +4,5 @@
3.4
3.5 # Configuration details for building and using a personal package manager.
3.6
3.7 -export DISTNAME=$DISTRIB_CODENAME
3.8 export PACKAGEROOT=$HOME/.userinstall
3.9 +export KEYRING=$(echo $DISTRIB_ID | tr '[:upper:]' '[:lower:]')-keyring