diff --git a/README.md b/README.md index 6ac8b2333f92293b6644bfa2d541a2bebc6d8c24..f09cc691df13b91540517f5fd82c05f513f437b1 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,13 @@ If you have a Windows system without WSL, then start [here](https://git.uwaterlo If you do not have access to a UNIX or UNIX-like environment then you can use the [older instructions](https://student.cs.uwaterloo.ca/~cs350/common/Install161.html) to build, run, debug and test in University of Waterloo's linux student environment. +## Windows Option A +This is an emulated environment and allows for bash like commands, but you are running windows underneath. +* Install [Git for Windows](https://gitforwindows.org/) +* Install [docker](https://docs.docker.com/desktop/windows/install) for Windows. -## Windows - Prerequistes to install a UNIX-like environment and Docker +## Windows Option B +This setup is for if you'd like to have the full linux environment, WSL2 is just a linux VM running on your computer! * Install [WSL](https://docs.microsoft.com/en-us/windows/wsl/install). * Install [docker](https://docs.docker.com/desktop/windows/install) for WSL. diff --git a/run.sh b/run.sh index 3c0a23a47576ba52953142b1dd0940b8b8a099b0..8f924099911454d5581597f3c565142f6398c2ce 100755 --- a/run.sh +++ b/run.sh @@ -1,9 +1,10 @@ #!/usr/bin/env bash +export MSYS_NO_PATHCONV=1 realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}" } -rm -rf logs +rm -rf "logs" set -e if [ "$#" -ne 1 ];then @@ -12,16 +13,16 @@ if [ "$#" -ne 1 ];then fi -mkdir -p logs -chmod a+rwx logs - +mkdir -p "logs" +chmod a+rwx "logs" KERNFILE=$1 docker run -it --rm \ - -v `realpath $KERNFILE`:/kernel \ - -v `realpath os161-container/assignments`:/assignments \ - -v `realpath logs`:/logs \ - --entrypoint /bin/bash \ + -v `realpath "$KERNFILE"`:/kernel \ + -v `realpath "os161-container/assignments"`:/assignments \ + -v `realpath "logs"`:/logs \ + --entrypoint bash \ --name os161 \ os161-runner docker kill os161 > /dev/null 2> /dev/null +export MSYS_NO_PATHCONV=0