comparison etc/setup_as_root.sh @ 81:85ab26e84d4e dml-dockerised

more unsupervised

-#!/bin/sh
+#!/bin/bash
 # ---------------------- CONFIGURATION PART ----------------------
 
 HAVE_MATLAB=no
 SWI_GUI=no
 SETUP_X=yes

 	#	exit 1
 	#fi
 	DO=
 fi
 # APT GET installs
-$DO apt-get install build-essential autoconf mercurial git pkg-config screen
-$DO apt-get install libossp-uuid-dev libssl-dev zlib1g-dev unixodbc-dev libsmf-dev libsqlite3-dev
-$DO apt-get install graphviz lilypond pdf2svg texlive-font-utils p7zip-full
-$DO apt-get install vorbis-tools lame sox faad flac libsox-fmt-all fluidsynth
-$DO apt-get install mysql-server-5 libmyodbc
+$DO apt-get install -y build-essential autoconf mercurial git pkg-config screen
+$DO apt-get install -y libossp-uuid-dev libssl-dev zlib1g-dev unixodbc-dev libsmf-dev libsqlite3-dev
+$DO apt-get install -y graphviz lilypond pdf2svg texlive-font-utils p7zip-full
+$DO apt-get install -y vorbis-tools lame sox faad flac libsox-fmt-all fluidsynth
+$DO apt-get install -y mysql-server-5 libmyodbc
 
 # Only if you want SWI Prolog GUI
 if [ $SWI_GUI == yes ]; then
-	$DO apt-get install libxpm-dev libxt-dev libjpeg-dev libx11-dev libxft-dev libxinerama1 libfontconfig1-dev
+	$DO apt-get install -y libxpm-dev libxt-dev libjpeg-dev libx11-dev libxft-dev libxinerama1 libfontconfig1-dev
 fi
 
 # If you have MATLAB
 if [ $HAVE_MATLAB == yes ]; then
 	DO=$DO DRY_RUN=$DRY_RUN as_root.d/init_matlab.sh

 
 if [ $SETUP_X  == yes ]; then
 	echo "Setting up X server..." 1>&2
 	if [ $HEADLESS == yes ]; then
 		echo "Installing dummy video driver for headless X server..." 1>&2
-		$DO apt-get install xinit xserver-xorg-video-dummy
+		$DO apt-get install -y xinit xserver-xorg-video-dummy
 
 		$DO install --mode=644 -bC xorg.conf /etc/X11
 	else
 		echo "Installing X server and window manager..." 1>&2
-		$DO apt-get install xinit blackbox
+		$DO apt-get install -y xinit blackbox
 	fi
 
 	if [ $DRY_RUN == yes ]; then
-		$DO dpkg-reconfigure x11-common
+                $DO sudo sed -i \
+                    's/allowed_users=console/allowed_users=anybody/' /etc/X11/Xwrapper.config
+
 	else
 		echo
 		echo "I am about to configure x11-common."
 		#echo "Please select 'Anybody' to allow dml to start the X server automatically."
 		#echo "Press RETURN to continue."
 		#read
 		#$DO dpkg-reconfigure x11-common
-               sudo sed -i \
+                $DO sudo sed -i \
                     's/allowed_users=console/allowed_users=anybody/' /etc/X11/Xwrapper.config
 	fi
 fi