Skip to content

Commit 857c802

Browse files
author
Cerem Cem ASLAN
committed
fixed virtual env instructions. minor improvements.
1 parent 32c2d21 commit 857c802

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ freeze-venv: __c
4949
create-venv:
5050
$(if $(SCADAJS_1_ENV),$(error SCADAJS_1_ENV variable is set, use it instead: $(SCADAJS_1_ENV)))
5151
$(eval NODE_VERSION := $(shell echo `grep "^#node@" nodeenv.txt | cut -d@ -f2` | sed 's/^$$/system/'))
52-
nodeenv --requirement=./nodeenv.txt --node=$(NODE_VERSION) --jobs=4 nodeenv
52+
nodeenv --requirement=./nodeenv.txt --node=$(NODE_VERSION) --prompt="($(VENV_NAME))" --jobs=4 nodeenv
5353

5454
__release_copy:
5555
@echo "Creating release for APP: $${APP:?}"

doc/using-virtual-environment.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
$ cd ./scada.js
1919
$ make create-venv
2020
$ ./venv ./nodeenv
21-
(nodeenv) $
21+
(scadajs1) $
2222

2323

2424
4. Install the Scada.js dependencies:
2525

26-
(nodeenv) $ make install-deps CONF=../dcs-modules.txt
26+
(scadajs1) $ make install-deps CONF=../dcs-modules.txt
2727
2828
5. Optional: Move your nodeenv to a central location and use it between projects:
2929

@@ -40,7 +40,7 @@
4040
# For Tmux VirtualEnv support
4141
tmux_get_var(){
4242
local key=$1
43-
tmux showenv | awk -F= -v key="$key" '$1==key {print $2}'
43+
[[ -n "$TMUX" ]] && tmux showenv | awk -F= -v key="$key" '$1==key {print $2}'
4444
}
4545

4646
# activate the virtual environment if it is declared

gulpfile.ls

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,7 @@ gulp.task \versionTrack, (done) ->
371371
unless argv.enable-version-polling
372372
unless argv.production
373373
log-info "Version Track",
374-
"Polling is disabled.\n
375-
\"make update-app-version\" manually.
376-
"
374+
"TIP: \"make update-app-version\" manually."
377375
return done!
378376

379377
curr = null

0 commit comments

Comments
 (0)