X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.bin%2Fcrostini-vapier-setup;h=c4068db4a5453eacc209de55c4e11c4ca0dd9cf1;hb=7b74f9fed3b6ef4058583ef2a110b912b174dd18;hp=c353016ef103516528c8ea67be5b9e02466fda9f;hpb=9dbdd908fb1a96a1cee5ca4623d4667b7374a169;p=home.git

diff --git a/.bin/crostini-vapier-setup b/.bin/crostini-vapier-setup
index c353016..c4068db 100755
--- a/.bin/crostini-vapier-setup
+++ b/.bin/crostini-vapier-setup
@@ -1,16 +1,42 @@
-#!/bin/bash
+#!/bin/bash -ex
+
+if [[ $# -ne 0 ]]; then
+	echo "Usage: $0"
+	exit 1
+fi
+
+if [[ ${UID} -ne 0 ]]; then
+	exec sudo "$0" "$@"
+fi
+
 pkgs=(
 	ipython
 	ipython3
 	pylint3
+	python3-bs4
+	python3-dev
+	python3-pip
+	python3-pytest
+	python3-pytest-cov
+	python3-requests
+	python3-virtualenv
+	tox
 
+	advancecomp
 	dict
 	elinks
 	firefox-esr
 	gimp
 	inkscape
+	jpegoptim
+	libreoffice
 	mpv
+	nomacs
+	optipng
+	pngcrush
+	sshfs
 	steam
+	xournal
 
 	autoconf
 	autoconf-archive
@@ -21,19 +47,25 @@ pkgs=(
 	ccache
 	clang
 	clang-format
+	cmake
 	dejagnu
 	diffstat
+	dnsutils
 	flex
 	gcc
+	gdb
 	gettext
 	g++
 	git
 	git-email
 	git-svn
-	gdb
+	gnupg
 	keychain
 	libtool
+	mosh
 	nano
+	netcat
+	ninja-build
 	patchutils
 	pax-utils
 	pinfo
@@ -43,8 +75,11 @@ pkgs=(
 	subversion
 	texinfo
 	tree
+	unrar
+	unzip
 	vim
 	zeal
+	zip
 
 	openjdk-11-jre-headless
 
@@ -60,40 +95,40 @@ pkgs=(
 	libsdl1.2-dev
 	libusb-1.0-0-dev
 	pkg-config
-	python3-bs4
-	python3-dev
-	python3-pip
-	python3-virtualenv
 	zlib1g-dev
 )
-exec sudo bash -c '
-set -ex
-printf "Defaults !tty_tickets\nDefaults timestamp_timeout=360\n" > /etc/sudoers.d/vapier
+
+printf "Defaults !tty_tickets\nDefaults timestamp_timeout=360\n" >/etc/sudoers.d/vapier
 chmod 440 /etc/sudoers.d/vapier
 
 # Add non-free sources for Steam.
 sed -i "/^deb .*\/debian .* main$/s:$: contrib non-free:" /etc/apt/sources.list
 dpkg --add-architecture i386
 
-curl "https://dl-ssl.google.com/linux/linux_signing_key.pub" | apt-key add -
-echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >/etc/apt/sources.list.d/google-chrome.list
+curl -s "https://dl-ssl.google.com/linux/linux_signing_key.pub" | apt-key add -
+echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" >/etc/apt/sources.list.d/google-chrome.list
+
+curl -s "https://packages.cloud.google.com/apt/doc/apt-key.gpg" | apt-key add -
+echo "deb [arch=amd64] https://packages.cloud.google.com/apt cloud-sdk main" >/etc/apt/sources.list.d/google-cloud-sdk.list
+
+curl -s "https://packages.microsoft.com/keys/microsoft.asc" | apt-key add -
+echo "deb [arch=amd64] https://packages.microsoft.com/repos/edge stable main" >/etc/apt/sources.list.d/microsoft-edge.list
 
 apt-get update
-apt-get dist-upgrade
+apt-get -y dist-upgrade
 
-apt-get -y install google-chrome-stable "$@"
+apt-get -y install "${pkgs[@]}" \
+	google-chrome-stable google-cloud-sdk microsoft-edge-dev
 
 ln -sf ~vapier/.profile.d/ROOT-bash_profile ~root/.bash_profile
 for f in .gitconfig .inputrc .nanorc ; do
 	ln -sf ~vapier/${f} ~root/${f}
 done
 rm -f ~root/.profile ~root/.bashrc
-echo . ~vapier/.profile.d/ROOT-bashrc > ~root/.bashrc
+echo . ~vapier/.profile.d/ROOT-bashrc >~root/.bashrc
 
 rm -f /etc/motd
-echo "[crostini]" > /etc/ps1_append
+echo "[crostini]" >/etc/ps1_append
 
 rm -f /etc/ssh/sshd_not_to_be_run
 /usr/sbin/sshd
-
-' bash "${pkgs[@]}"