Add nabia release

makeiso.sh

@@ -37,9 +37,9 @@ http://ftp.acc.umu.se/mirror/trisquel/iso/
 http://mirrors.ocf.berkeley.edu/trisquel-images/"
 export MIRROR="http://archive.trisquel.org/trisquel/" # The upstream full repository
 export MKTORRENT=$PWD/"files/mktorrent-1.0/mktorrent"
-#Add simple proxy support only if proxy address and port are specified.
-export PROXY_ADDRESS=""
-export PROXY_PORT=""
+#Add proxy support only if proxy variable is specified.
+#Example: PROXY_FULL_ADDRESS="http://user:password@proxy.example.com:3128"
+export PROXY_FULL_ADDRESS=""
 
 usage(){
 echo "Trisquel iso build script
@@ -233,9 +233,9 @@ chmod +x $CHROOT/usr/sbin/policy-rc.d
 #$C apt-key add /tmp/key.asc
 #rm $CHROOT/tmp/key.asc
 
-#use proxy only if proxy variables are set
-[ -n "$PROXY_ADDRESS" ] && [ -n "$PROXY_PORT" ] && \
-echo "Acquire::http::Proxy \"http://$PROXY_ADDRESS:$PROXY_PORT/\";" > $CHROOT/etc/apt/apt.conf.d/proxy.conf
+#use proxy only if proxy variable is set
+[ -n "$PROXY_FULL_ADDRESS" ] && \
+echo "Acquire::http::Proxy \"http://$PROXY_FULL_ADDRESS/\";" > $CHROOT/etc/apt/apt.conf.d/proxy.conf
 # apt setup for the debootstrap second stage
 cat << EOF > $CHROOT/etc/apt/sources.list
 deb $MIRROR $CODENAME main
@@ -332,9 +332,9 @@ echo "touch /tmp/finished" >> $CHROOT/tmp/install
 $C bash -x -e /tmp/install
 rm $CHROOT/tmp/finished
 
-#use proxy only if proxy variables are set
-[ -n "$PROXY_ADDRESS" ] && [ -n "$PROXY_PORT" ] && \
-echo "Acquire::http::Proxy \"http://$PROXY_ADDRESS:$PROXY_PORT/\";" > $CHROOT/etc/apt/apt.conf.d/proxy.conf
+#use proxy only if proxy variable is set
+[ -n "$PROXY_FULL_ADDRESS" ] && \
+echo "Acquire::http::Proxy \"http://$PROXY_FULL_ADDRESS/\";" > $CHROOT/etc/apt/apt.conf.d/proxy.conf
 
 cat << EOF > $CHROOT/etc/apt/sources.list
 # Trisquel repositories for supported software and updates
@@ -399,7 +399,7 @@ $C apt-get autoclean
 
 rm -rf $CHROOT/var/cache/apt-xapian-index/*
 ##############################################################################
-                                                                              
+
 
 [ $DIST = 'trisquel-sugar' ] && echo "background=/usr/share/plymouth/themes/sugar/sugar.png"  >> $CHROOT/etc/lightdm/lightdm-gtk-greeter.conf
 [ $DIST = 'trisquel-sugar' ] && echo -e "[Seat:*]\nuser-session=sugar"  >> $CHROOT/etc/lightdm/lightdm.conf.d/sugar.conf