Add nabia release

makeiso.sh

@@ -128,6 +128,7 @@ export LANGUAGE=C
 
 DO_SOURCE(){
 
+#use proxy only if proxy variables are set
 cat << EOF > /etc/apt/sources.list
 deb $MIRROR $CODENAME main
 deb $MIRROR $CODENAME-updates main
@@ -186,7 +187,7 @@ then
     echo "Umounting and removing $1"
     fuser -k $1 || true
     for MOUNT in $1/proc $1/sys $1/dev/pts $1/tmp $1
-    do 
+    do
         umount $MOUNT || true
     done
 rm -rf $1
@@ -261,6 +262,7 @@ KERNEL=linux-generic
 # package install
 echo "KERNEL=$KERNEL" > $CHROOT/tmp/install
 echo "DIST=$DIST" >> $CHROOT/tmp/install
+echo "REL=$REL" >> $CHROOT/tmp/install
 echo 'LANG=C
 apt-get update
 apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages --no-install-recommends $KERNEL trisquel-minimal trisquel-base
@@ -279,9 +281,10 @@ apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-he
 aptitude unmarkauto $(apt-cache depends trisquel-desktop-common-recommended | grep Depends | sed s/.*:.//)
 apt-get clean
 apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages --no-install-recommends $(apt-cache show $DIST | grep ^Suggests|sed s/Suggests://|sed s/\,//g|head -n1)
-
+[ $REL = 9.0 ] && \
 apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages --no-install-recommends  xorg xserver-xorg xserver-xorg-input-all xserver-xorg-video-all mesa-vdpau-drivers va-driver-all vdpau-driver-all vdpau-va-driver  casper grub-pc gparted language-pack-en language-pack-es language-pack-gnome-en language-pack-gnome-es hyphen-en-us mythes-en-us lupin-casper abrowser-locale-es aspell aspell-en aspell-es dictionaries-common language-pack-en-base language-pack-gnome-en-base wamerican wbritish wspanish plymouth-theme-trisquel-text plymouth-theme-trisquel-logo gnome-brave-icon-theme
-
+[ $REL = 10.0 ] && \
+apt-get install -y --allow-downgrades --allow-remove-essential --allow-change-held-packages --no-install-recommends  xorg xserver-xorg xserver-xorg-input-all xserver-xorg-video-all mesa-vdpau-drivers va-driver-all vdpau-driver-all casper grub-pc gparted language-pack-en language-pack-es language-pack-gnome-en language-pack-gnome-es hyphen-en-us mythes-en-us lupin-casper abrowser-locale-es aspell aspell-en aspell-es dictionaries-common language-pack-en-base language-pack-gnome-en-base wamerican wbritish wspanish plymouth-theme-trisquel-text plymouth-theme-trisquel-logo gnome-brave-icon-theme
 
 
 apt-get clean
@@ -326,7 +329,7 @@ echo "apt-get --allow-downgrades --allow-remove-essential --allow-change-held-pa
 echo "apt-get clean" >> $CHROOT/tmp/install
 echo "touch /tmp/finished" >> $CHROOT/tmp/install
 
-$C bash -x -e /tmp/install
+$C bash -x -e -v /tmp/install
 rm $CHROOT/tmp/finished
 
 #use proxy only if proxy variables are set