diff --git a/Makefile b/Makefile index 25fe792..fdf68e2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ --include nemu/Makefile.git +include nemu/Makefile.git default: @echo "Please run 'make' under any subprojects to compile." @@ -11,6 +11,6 @@ clean: submit: clean git gc - cd .. && tar cj $(shell basename `pwd`) > $(STU_ID).tar.bz2 + STUID=$(STUID) STUNAME=$(STUNAME) bash -c "$$(curl -s http://moon.nju.edu.cn/people/yyjiang/teach/submit.sh)" .PHONY: default clean submit diff --git a/README.md b/README.md index affb6fa..0f5e4b7 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# ICS2017 Programming Assignment +# ICS2018 Programming Assignment This project is the programming assignment of the class ICS(Introduction to Computer System) in Department of Computer Science and Technology, Nanjing University. For the guide of this programming assignment, -refer to http://nju-ics.gitbooks.io/ics2017-programming-assignment/content/ +refer to http://nju-ics.gitbooks.io/ics2018-programming-assignment/content/ To initialize, run ```bash diff --git a/init.sh b/init.sh index b72197c..9e96d06 100644 --- a/init.sh +++ b/init.sh @@ -1,5 +1,7 @@ #!/bin/bash +version=ics2018 + log="" function init() { @@ -9,7 +11,7 @@ function init() { fi while [ ! -d $1 ]; do - git clone -b ics2017 https://github.com/NJU-ProjectN/$1.git + git clone -b $version https://github.com/NJU-ProjectN/$1.git done log="$log$1 `cd $1 && git log --oneline --no-abbrev-commit -n1`"$'\n' rm -rf $1/.git @@ -30,9 +32,11 @@ case $input in source ~/.bashrc git add -A - git commit -am "ics2017 initialized"$'\n\n'"$log" + git commit -am "$version initialized"$'\n\n'"$log" echo "Initialization finishes!" + echo "By default this script will add enviornment variables into ~/.bashrc." + echo "If you use shell other than bash, please add these enviornment variables manually." ;; [nN])