Edit sources.list with sed instead of appending.

Reduce apps list to "basic".
Add lightdm config files. (Will go in bunsen-configs later.)

config

@@ -7,7 +7,7 @@ backup_dir="/backup/bunsen-alpha-netinstall" # replaced system files will be mov
 backup_suffix="~bunsen-alpha-netinst-$(date +%FT%T)~" # for backed-up files
 
 # files and directories which must be packaged with this script (array):
-necessary_files=(sysfiles1 sysfiles2 bunsen-netinstall-logs pkgs-recs pkgs-norecs extra_repos preinstall_commands postinstall_commands github_install git2deb-bl copyright README)
+necessary_files=(sysfiles1 sysfiles2 bunsen-netinstall-logs pkgs-recs pkgs-norecs gen_sources preinstall_commands postinstall_commands github_install git2deb-bl copyright README)
 
 # Default behaviour is to add files in sysfiles1 & 2 to
 # the existing system directories.

gen_sources

@@ -0,0 +1 @@
+sed -r 's/(^deb [^ ]*)( jessie | jessie-updates | jessie\/updates | jessie-backports ).*$/\1\2 main contrib non-free/g' /etc/apt/sources.list  2> >( tee -a "$logfile" ) > sysfiles1/etc/apt/sources.list || giveup "There was a problem editing sources.list." 1

install

@@ -358,12 +358,18 @@ bigmsg "Adjusting package management (apt) settings."
 if [[ -s extra_repos ]]; then
     if [[ $(</etc/apt/sources.list) = *$(<extra_repos)* ]]
     then
-        msg "extra_repos already appended to sysfiles1/etc/apt/sources.list"
+        msg "extra_repos already appended to /etc/apt/sources.list"
     else
         msg "adding extra repositories to sources.list"
         sed '/deb-src/s/^/#/' /etc/apt/sources.list 2> >( tee -a "$logfile" ) > sysfiles1/etc/apt/sources.list || giveup "There was a problem editing sources.list." 1
         cat extra_repos 2> >( tee -a "$logfile" ) >> sysfiles1/etc/apt/sources.list || giveup "There was a problem appending extra_repos to sources.list." 1
     fi
+elif [[ -r gen_sources ]]; then
+    if [[ -s  sysfiles1/etc/apt/sources.list ]]; then
+        msg "sysfiles1/etc/apt/sources.list already generated"
+    else
+        . gen_sources # commands to generate sysfiles1/etc/apt/sources.list
+    fi
 fi
 
 [[ -s sysfiles1/etc/apt/sources.list ]] || giveup "There is no sources.list file." 1

pkgs-full-norecs

@@ -0,0 +1,75 @@
+# Packages here will be installed without recommends.
+openbox
+obconf
+thunar
+network-manager-gnome
+network-manager-openvpn-gnome
+network-manager-pptp-gnome
+network-manager-vpnc-gnome
+lightdm
+obmenu
+desktop-base
+tint2
+clipit
+suckless-tools
+gmrun
+nitrogen
+hsetroot
+conky-all
+compton
+terminator
+file-roller
+geany
+viewnior
+synaptic
+lxappearance
+xfce4-notifyd
+libnotify-bin
+gksu
+zenity
+arandr
+xinput
+xsel
+xdotool
+htop
+fbxkb
+scrot
+thunar-volman
+python-xdg
+python-notify
+flashplugin-nonfree
+gnome-keyring
+libpam-gnome-keyring
+xfce4-screenshooter
+xscreensaver
+ntp
+curl
+gparted
+file-roller
+gdebi
+fonts-dejavu
+fonts-droid
+fonts-freefont-ttf
+fonts-liberation
+ttf-mscorefonts-installer
+dmz-cursor-theme
+gtk2-engines-murrine
+gtk2-engines-pixbuf
+gtk2-engines
+gimp
+gimp-plugin-registry
+evince
+gnumeric
+galculator
+gigolo
+catfish
+gsimplecal
+gtrayicon
+xchat
+transmission-gtk
+xfce4-power-manager
+xfce4-power-manager-plugins
+thunar-archive-plugin
+thunar-media-tags-plugin
+geany-plugins
+ghostscript

pkgs-full-recs

@@ -0,0 +1,73 @@
+# Packages here will be installed with recommends.
+# comments are allowed
+policykit-1 # comments after entries are OK too
+xorg
+iceweasel
+wireless-tools
+firmware-linux
+firmware-iwlwifi
+firmware-ralink
+firmware-ipw2x00
+firmware-realtek
+intel-microcode
+amd64-microcode
+e2fsprogs
+xfsprogs
+reiserfsprogs
+reiser4progs
+jfsutils
+ntfs-3g
+fuse
+gvfs
+gvfs-fuse
+fusesmb
+unrar
+unace
+unalz
+unzip
+lzop
+rzip
+zip
+xz-utils
+arj
+bzip2
+alsa-base
+alsa-utils
+vlc
+vlc-plugin-notify
+lame
+pulseaudio
+pulseaudio-module-x11
+xfce4-mixer
+xfce4-volumed
+pavucontrol
+xfburn
+volumeicon-alsa
+bash-completion
+lintian
+libnss-mdns
+gvfs-bin
+gvfs-backends
+python-keybinder
+xdg-utils
+rsync
+anacron
+usbutils
+wmctrl
+menu
+bc
+screen
+cowsay
+figlet
+whois
+rpl
+cpufrequtils
+debconf-utils
+apt-xapian-index
+build-essential
+user-setup
+avahi-utils
+avahi-daemon
+ftp
+openssh-client
+sshfs

pkgs-norecs

@@ -1,4 +1,7 @@
 # Packages here will be installed without recommends.
+# Base install
+policykit-1 # comments after entries are OK too
+xorg
 openbox
 obconf
 thunar
@@ -16,13 +19,66 @@ gmrun
 nitrogen
 hsetroot
 conky-all
-compton
-terminator
+xfce4-terminal
 file-roller
 geany
-viewnior
+mirage
 synaptic
 lxappearance
+dillo
+wireless-tools
+firmware-linux
+firmware-iwlwifi
+firmware-ralink
+firmware-ipw2x00
+firmware-realtek
+intel-microcode
+amd64-microcode
+e2fsprogs
+xfsprogs
+reiserfsprogs
+reiser4progs
+jfsutils
+ntfs-3g
+fuse
+gvfs
+gvfs-fuse
+fusesmb
+unrar
+unace
+unalz
+unzip
+lzop
+rzip
+zip
+xz-utils
+arj
+bzip2
+alsa-base
+alsa-utils
+xfce4-mixer
+xfce4-volumed
+volti
+bash-completion
+lintian
+libnss-mdns
+gvfs-bin
+gvfs-backends
+python-keybinder
+xdg-utils
+rsync
+anacron
+usbutils
+wmctrl
+menu
+bc
+screen
+whois
+rpl
+user-setup
+avahi-utils
+avahi-daemon
+openssh-client
 xfce4-notifyd
 libnotify-bin
 gksu
@@ -32,44 +88,19 @@ xinput
 xsel
 xdotool
 htop
-fbxkb
 scrot
 thunar-volman
 python-xdg
 python-notify
-flashplugin-nonfree
-gnome-keyring
-libpam-gnome-keyring
-xfce4-screenshooter
-xscreensaver
 ntp
 curl
-gparted
-file-roller
-gdebi
 fonts-dejavu
 fonts-droid
 fonts-freefont-ttf
 fonts-liberation
-ttf-mscorefonts-installer
 dmz-cursor-theme
 gtk2-engines-murrine
 gtk2-engines-pixbuf
 gtk2-engines
-gimp
-gimp-plugin-registry
-evince
-gnumeric
-galculator
-gigolo
-catfish
-gsimplecal
-gtrayicon
-xchat
-transmission-gtk
 xfce4-power-manager
 xfce4-power-manager-plugins
-thunar-archive-plugin
-thunar-media-tags-plugin
-geany-plugins
-ghostscript

pkgs-recs

@@ -1,73 +1,3 @@
 # Packages here will be installed with recommends.
 # comments are allowed
-policykit-1 # comments after entries are OK too
-xorg
-iceweasel
-wireless-tools
-firmware-linux
-firmware-iwlwifi
-firmware-ralink
-firmware-ipw2x00
-firmware-realtek
-intel-microcode
-amd64-microcode
-e2fsprogs
-xfsprogs
-reiserfsprogs
-reiser4progs
-jfsutils
-ntfs-3g
-fuse
-gvfs
-gvfs-fuse
-fusesmb
-unrar
-unace
-unalz
-unzip
-lzop
-rzip
-zip
-xz-utils
-arj
-bzip2
-alsa-base
-alsa-utils
-vlc
-vlc-plugin-notify
-lame
-pulseaudio
-pulseaudio-module-x11
-xfce4-mixer
-xfce4-volumed
-pavucontrol
-xfburn
-volumeicon-alsa
-bash-completion
-lintian
-libnss-mdns
-gvfs-bin
-gvfs-backends
-python-keybinder
-xdg-utils
-rsync
-anacron
-usbutils
-wmctrl
-menu
-bc
-screen
-cowsay
-figlet
-whois
-rpl
-cpufrequtils
-debconf-utils
-apt-xapian-index
-build-essential
-user-setup
-avahi-utils
-avahi-daemon
-ftp
-openssh-client
-sshfs
+# Base install