Skip to content

Commit 766d452

Browse files
committed
updating to bin-dbwebb v1.0.14
1 parent 962aa6f commit 766d452

7 files changed

Lines changed: 211 additions & 14 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ History
4646

4747
v1.0.x (latest)
4848

49+
* Updated `bin/dbwebb` to version v1.0.14.
4950
* Updated examples in `example/curses` when releasing kmom05.
5051
* `.pylintrc` to ignore broad-except.
5152
* Inspect javascript1 kmom01 - 04 added.

‎bin/.dbwebb.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION="1.0.12"
1+
VERSION="1.0.14"

‎bin/README.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,19 @@ History
2929

3030
v1.0.x (latest)
3131

32+
* Changed place to ignore upload of me/ when checking another user.
33+
34+
35+
v1.0.14 (2014-09-30)
36+
37+
* Added publish to all kmoms.
38+
* Support for testing game in python
39+
* Added inspect for python kmom05.
40+
41+
42+
v1.0.13 (2014-09-30)
43+
44+
* Fixed issue #7 to publish a students kmom on the web - as part of inspect.
3245
* Inspect javascript1 kmom01 - 04 added.
3346
* Inspect plane.py failed when windows style line endings.
3447

‎bin/dbwebb‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,12 +313,12 @@ setChmod()
313313
{
314314
$ECHO "\nUpdating chmod on file and dir."
315315

316-
for filename in $(find "$SOURCE/me" -type d); do
317-
chmod 755 "$filename"
316+
for filename in $(find "$SOURCE" -type d); do
317+
chmod 750 "$filename"
318318
done
319319

320-
chmod -R u+rw "$SOURCE/me"
321-
chmod -R go+r "$SOURCE/me"
320+
chmod -R u+rw "$SOURCE"
321+
chmod -R g+r "$SOURCE"
322322
}
323323

324324

@@ -412,7 +412,15 @@ inspectResults()
412412
INTRO="I will now inspect the choosen kmom for the choosen user, if you have privilegies to do that."
413413
COMMAND="$SSH 'cd $BASEDIR/$PROJECT; bin/dbwebb-inspect $WHAT $WHO'"
414414
MESSAGE="to inspect the course results."
415-
executeCommand "$INTRO" "$UPLOAD; $COMMAND" "$MESSAGE"
415+
416+
if [ "$USER" = "$WHO" ]
417+
then
418+
upload="$UPLOAD"
419+
else
420+
upload="$UPLOAD_MINIMAL"
421+
fi
422+
423+
executeCommand "$INTRO" "$upload; $COMMAND" "$MESSAGE"
416424
}
417425

418426

@@ -440,6 +448,8 @@ updateConfigIfNeeded "update"
440448

441449

442450
UPLOAD="rsync -av --delete --exclude literature --exclude .git -e \"ssh $SSH_KEY_OPTION\" $SOURCE $DESTINATION"
451+
UPLOAD_MINIMAL="rsync -av --delete --exclude me --exclude tutorial --exclude example --exclude literature --exclude .git -e \"ssh $SSH_KEY_OPTION\" $SOURCE $DESTINATION"
452+
443453
SSH="ssh ${USER}@${HOST} $SSH_KEY_OPTION"
444454

445455

‎bin/dbwebb-config-sample‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COURSE="DEFAULT_COURSE"
99
#
1010
# Do not change below unless you are really sure on the effects
1111
#
12-
VERSION_CONFIG="1.0.12"
12+
VERSION_CONFIG="1.0.14"
1313

1414
MSG_OK="\033[0;30;42mOK\033[0m"
1515
MSG_WARNING="\033[43mWARNING.\033[0m"
@@ -61,11 +61,19 @@ fi
6161
#
6262
SERVERURL="http://www.student.bth.se"
6363
BASEURL="$SERVERURL/~$USER/$BASEDIR/$PROJECT"
64+
6465
TARGET="$PWD"
6566
BUILD1="$HOME/www"
6667
BUILD2="$BUILD1/$BASEDIR"
6768
BUILD="$BUILD2/$PROJECT"
6869

70+
STUD_DIR="stud"
71+
PUBLISH_STUD="$BUILD2/$STUD_DIR"
72+
73+
EDITOR_DEFAULT="nano"
74+
EDITOR=${EDITOR:-$EDITOR_DEFAULT}
75+
76+
6977

7078
#
7179
# dbwebb-create

0 commit comments

Comments
 (0)