updated submodules and fixed issue with Makefile: ActivityWatch#99 (c…

…omment)
snowy1220 · Feb 2, 2018 · 54ba373 · 54ba373
1 parent e5e4e73
commit 54ba373
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ build
 dist
 __pycache__
 .*cache
+*.swp
 
 .idea
 venv*

diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ SHELL := /usr/bin/env bash
 #  - `DEV=true` makes all `pip install` commands run with `--editable`.
 #    Removes the need to reinstall Python packages when working on them.
 build:
-	if [ -d "aw-core/.git" ]; then \
+	if [ -e "aw-core/.git" ]; then \
 		echo "Submodules seem to already be initialized, continuing..."; \
 	else \
 		git submodule update --init --recursive; \

diff --git a/aw-core b/aw-core
diff --git a/aw-watcher-afk b/aw-watcher-afk
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ build @@
     dist
     __pycache__
     .*cache
+    *.swp
     .idea
     venv*
@@ Expand Down @@