Fully updated the README.md

Added rust to installation
Fixed version reporting. Installing all software is optional. Can be performed later by user in Linux.

Author: kaisalmen

LICENSE

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2019 Kai Salmen
+Copyright (c) 2021 Kai Salmen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -1,14 +1,13 @@
-Automated WSL 2 Development Machine
+Automated creation of WSL 2 Development Machine
 ===
 
-Welcome to the WSL Tooling repository.
+Welcome to the WSL Tooling repository. The aim of this project is to supply with the ability to autpmatically install a fully working WSL 2 development environment just by invoking a powershell script even without the `wsl --install` flag.
 
-This is a guide for an almost automatic setup and configuration of Ubuntu LTS for Windows Subsystem for Linux V2.
-The aim is to create a development environment that combines the best of both worlds without the need for an extra Virtual machine.
+I have fully reworked and updated the whole installation. Once your Windows is capabale of running WSL 2 instances, the Ubuntu LTS WSL 2 installation is fully automatic.
 
 
 ## Preparation
-This repository must be available on your local disk.
+This repository must be clone on your local disk.
 
 ### Enable Windows Subsystem for Linux V2 support
 ***This step is only required if WSL support was never activated before on your Windows machine*** 
@@ -30,62 +29,54 @@ Set the default WSL version to 2. Open a powershell with administrative privileg
 ## Installation
 
 ### Download and Install Ubuntu LTS (20.04)
-If not already done, open a new powershell with administrative privileges and install Ubuntu LTS.
-You need to provide a name (`<wslName>`) of the new wsl,
-the directory (`<wslInstallationPath>`) where the vhdx disk of the new WSL is stored,
-and you need to provide a `<username>` of the default user:
+If not already done, open a new powershell with administrative privileges and install Ubuntu LTS. You **need** to provide four arguments. If you don't specify them on command line, then the script will ask:
+- `<wslName>`: Provide a name for the WSL that is goind to be created (e.g. `devbox`)
+- `<wslInstallationPath>`: The directory where the vhdx disk of the new WSL is stored
+- `<username>`: the name of the user that is used when WSL distro is launched without `-u`
+- `<installAllSoftware>`: Tell if all software packages (see [Available Software](#Available-Software)) shall be installed or if `false` only a fully updated system with configured user is supplied
+For example, the command can look as follows:
 ```powershell
-installUbuntuLTS.ps1 <wlsName> <wslInstallationPath> <username>
+installUbuntuLTS.ps1 devbox D:\WSL2\devbox kai true
 ```
 
+### Available Software Package
+If don't want to install all packages during initial WSL creation, you can install them one buy one. They are available here [./scripts](./scripts). These are currently available
+- Ubunut Base Package (git virt-manager firefox dbus-x11 x11-apps make unzip) ([scripts/install/installBasePackage.sh](./scripts/install/installBasePackage.sh))
+- docker &docker-compose ([scripts/install/installDocker.sh](./scripts/install/installDocker.sh))
+- OpenJDK 11 ([scripts/install/installOpenjdk.sh](scripts/install/installOpenjdk.sh))
+- Apache Maven ([scripts/install/installMaven.sh](./scripts/install/installMaven.sh))
+- n (node manager), Nodejs, npm & Typescript ([scripts/install/installNodejs.sh](./scripts/install/installNodejs.sh)
+- Rust and Cargo ([scripts/install/installRust.sh](./scripts/install/installRust.sh))
+- Deno ([scripts/install/installDeno.sh](./scripts/install/installDeno.sh))
+- Google Chrome ([scripts/install/installChrome.sh](./scripts/install/installChrome.sh))
 
-### Further information
-It is possible to have different distributions at the same time. Use this [resource from Microsoft](https://docs.microsoft.com/en-us/windows/wsl/wsl-config) as starting point for further reading.
 
-## Configuration
-Inside the "Ubuntu 18.04" application change directory to where this repository has been checked out (all Windows drives are available under `/mnt`).
-Automatically pre-configure Ubuntu 18.04 with the following script [setupWslUbuntu1804.sh](setupUbuntuLTS.sh):
-- It updates the system and removes unnecessary packages afterwards
-- It installs OpenJDK-8, Apache maven 3.6.x, node.js LTS from nodesource and makes them available system wide
-- It configures dbus for XServer usage including setup of environment variables in `/etc/profile.d`
-- It install git, virt-manager and firefox
-After the setup is complete and you restarted Ubuntu, Windows drives are available at `/` (e.g. `/c/Windows`).
+Firefox and other tools can be installed directly with Ubuntu's package manager `apt`. Some of the above scripts also use `apt` and apply additional configuration.
 
-**Hint:** Firefox does not work properly with remote X. Set `browser.newtab.preload` to `false` in `about:config` to fix this issue."
+#### Removal
+Not available yet, but with fast a internet connection and fast SSD you have the WSL recreated in approx. five minutes. :sunglasses:
 
-### Available Scripts
-More scripts are available for automated installation and configuration in the [./scripts](./scripts) directory:
-- maven ([scripts/install/installMaven.sh](./scripts/install/installMaven.sh))
-- Docker to be connected to Docker for Windows ([scripts/install/installDocker.sh](./scripts/install/installDocker.sh))
-- nodejs ([scripts/install/installNodejs.sh](./scripts/install/installNodejs.sh)
-- Google Chrome (buggy, disabled for now) ([scripts/install/installChrome.sh](./scripts/install/installChrome.sh))
-- OpenJDK 8 ([scripts/install/installOpenjdk8.sh](scripts/install/installOpenjdk.sh))
 
-Firefox and other tools can be installed directly with Ubuntu's package manager `apt`. Some of the above scripts also use `apt` and apply additional configuration.
+## Usage
 
-This list will be expanded in the future.
+### X-Server
+I recommend to use [VcXsrv](https://sourceforge.net/projects/vcxsrv/) (also available via chocolatey) to connect to user interfaces launched from WSL on display 0. The WSL linux setup configures everything properly. Use the following Powershell script to launch (it assume vcxsrv is installed at default location `C:\Program Files\VcXsrv\vcxsrv.exe`):
+```powershell
+.\scripts\xserver\xerver.ps1
+```
 
 ### Certificates
 Copy any certificates you require under `/usr/local/share/ca-certificates/` and the run the command:
 ```bash
 sudo update-ca-certificates
 ```
 
-## Windows Integration
-
-### X-Server
-Use [VcXsrv](https://sourceforge.net/projects/vcxsrv/) to connect to user interfaces launched from WSL on display 0. The setup configures everything properly. Just use the XLaunch in Mulit-Window mode and you are ready to go.
-
-### Lauch shell scripts
-Set WSL as default bash execution:
-https://superuser.com/questions/1260528/associating-linux-shell-sh-scripts-on-windows-10-to-bash-or-wsl
-
-### Console Emulator
-Use a console emulator like [ConEmu](https://conemu.github.io/) for a better working environment. 
-
-## Known issues
-When you use a VPN the wrong primary name resolution host is likely contained in `/etc/resolv.conf`. Comment the home/local address DNS host preventing proper name resolution in the connected VPN network.  
+## Misc
+- My Terminal recommendation in 2021 clearly is [Microsoft Terminal](https://github.com/microsoft/terminal)
+- Overview of [WSL commands and launch configurations](https://docs.microsoft.com/en-us/windows/wsl/wsl-config)
+- For Development wiht Visual Studio Code use the `Remote - WSL` extension
 
+Constructive feedback is appreciated!
 
 Have fun!
 

installSoftware.sh

@@ -1,13 +1,8 @@
 Param (
-[Parameter(Mandatory=$True)]
-[ValidateNotNull()]
-[string]$wslName,
-[Parameter(Mandatory=$True)]
-[ValidateNotNull()]
-[string]$wslInstallationPath,
-[Parameter(Mandatory=$True)]
-[ValidateNotNull()]
-[string]$username
+[Parameter(Mandatory=$True)][ValidateNotNull()][string]$wslName,
+[Parameter(Mandatory=$True)][ValidateNotNull()][string]$wslInstallationPath,
+[Parameter(Mandatory=$True)][ValidateNotNull()][string]$username,
+[Parameter(Mandatory=$True)][ValidateNotNull()][string]$installAllSoftware
 )
 
 curl.exe -L -o .\staging\ubuntuLTS.appx https://aka.ms/wslubuntu2004
@@ -24,12 +19,15 @@ Remove-Item .\staging\$wslName.zip
 Remove-Item -r .\staging\$wslName\
 
 # Update the system
-wsl -d $wslName -u root -e scripts/install/installBasePackages.sh
+wsl -d $wslName -u root -- apt update`; apt upgrade -y
 
 # create your user and add it to sudoers
 wsl -d $wslName -u root -e scripts/config/system/createUser.sh $username
 
 # ensure WSL Distro is restarted when first used with user account
 wsl -t $wslName
 
-wsl -d $wslName -u $username -e ./installSoftware.sh
+if ($installAllSoftware -ieq $true) {
+    wsl -d $wslName -u root -- ./scripts/install/installBasePackages.sh
+    wsl -d $wslName -u $username -- ./scripts/install/installAllSoftware.sh
+}

installUbuntuLTS.ps1

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 dbus_status=$(service dbus status)
 if [[ $dbus_status = *"is not running"* ]]; then

scripts/config/local/configureDbus.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 export DENO_INSTALL="~/.deno"
 export PATH="$DENO_INSTALL/bin:$PATH"

scripts/config/local/configureDeno.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 UPDATED_PATH=${PATH}
 

scripts/config/local/configureJvmEnv.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Added by n-install (see http://git.io/n-install-repo).
 export N_PREFIX="$HOME/n"; [[ :$PATH: == *":$N_PREFIX/bin:"* ]] || PATH+=":$N_PREFIX/bin"

scripts/config/local/configureN.sh

@@ -12,4 +12,4 @@ modifyBashrc "configureDbus.sh" ". ${HOMEDIR}/.local/bin/env/configureDbus.sh"
 
 copyConfigureScript "configureXServer.sh"
 modifyBashrc "configureXServer.sh" ". ${HOMEDIR}/.local/bin/env/configureXServer.sh"
-addSudoers "${USERNAME} ALL=(root) NOPASSWD: ${HOMEDIR}/.local/bin/env/configureDbus.sh" "${USERNAME}_configureXServer"
+addSudoers "${USERNAME} ALL=(root) NOPASSWD: ${HOMEDIR}/.local/bin/env/configureDbus.sh" "${USERNAME}_configureDbus"

scripts/config/system/prepareXServer.sh

@@ -12,7 +12,7 @@ modifyBashrc () {
     echo ${writeString} >> ${HOMEDIR}/.bashrc
     . ${HOMEDIR}/.bashrc
   else
-    echo "${HOMEDIR}/.bashrc is already properly configured."
+    echo "${searchFor}: ${HOMEDIR}/.bashrc is already properly configured."
   fi
 }