Merge pull request #247 from mithro/scripts-fix

Small extra fixes to the setup scripts

scripts/bootstrap.sh

@@ -6,7 +6,10 @@ then
     exit 1
 fi
 
-GIT_REPO=https://github.com/timvideos/HDMI2USB-misoc-firmware.git
+if [ -z "$GITHUB_USER" ]; then
+  GITHUB_USER=timvideos
+fi
+GIT_REPO=https://github.com/$GITHUB_USER/HDMI2USB-misoc-firmware.git
 if [ -z "$GIT_BRANCH" ]; then
   GIT_BRANCH=master
 fi

scripts/get-env-root.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+apt-get install -y realpath
+
 if [ "`whoami`" != "root" ]
 then
     echo "Please use sudo to run this script!"
@@ -12,7 +14,6 @@ SETUP_DIR=$(dirname $SETUP_SRC)
 set -x
 set -e
 
-apt-get install -y realpath
 apt-get install -y wget
 apt-get install -y build-essential
 # Need gpg to do the unencryption of Xilinx tools
@@ -37,17 +38,17 @@ apt-get install -y iverilog gtkwave
 
 # libfpgalink
 
-sudo apt-get install -y libreadline-dev libusb-1.0-0-dev libftdi-dev python-yaml fxload
+apt-get install -y libreadline-dev libusb-1.0-0-dev libftdi-dev python-yaml fxload
 
 # Load custom udev rules
 (
 	cp -uf  $SETUP_DIR/52-hdmi2usb.rules /etc/udev/rules.d/
-	sudo adduser $USER dialout
+#	adduser $USER dialout
 )
 
 # Get the vizzini module needed for the Atlys board
-sudo apt-get install -y software-properties-common
-sudo -E add-apt-repository -y ppa:timvideos/fpga-support
-sudo apt-get update
-sudo apt-get install -y vizzini-dkms
-sudo apt-get install -y ixo-usb-jtag
+apt-get install -y software-properties-common
+add-apt-repository -y ppa:timvideos/fpga-support
+apt-get update
+apt-get install -y vizzini-dkms
+apt-get install -y ixo-usb-jtag