--- a/Makefile	Tue Jan 29 11:22:19 2019 -0800
+++ b/Makefile	Sun Apr 28 17:06:20 2019 -0700
@@ -1,12 +1,13 @@
 #mc40 is "On Device Storage"
 #tc55 is "Internal Storage"
 
+na=$(shell find . -iname '*.c' -o -iname '*.h' -o -iname '*.cpp')
 style:=release
 dest:=/run/user/1000/gvfs/mtp*/*torage/Download
 ver:=$(shell grep versionName app/src/main/AndroidManifest.xml | cut -d'"' -f2)
-apk:='app/build/outputs/apk/510Connectbot-$(ver).apk'
+apk:='app/build/outputs/apk/510Connectbot-$(ver).$(style).apk'
 id:=$(shell hg id --id || echo 1)
-da:=$(shell date +%Y-%m-%d)
+da:=$(shell date '+%Y-%m-%dT%H:%M:%S')
 version:=\
 <?xml version=\"1.0\" encoding=\"utf-8\"?>\n\
 <resources>\n\
@@ -15,10 +16,13 @@
 
 ifeq ($(style),release)
     task:=assembleArmRelease
+	debug:=0
 else
 	task:=assembleArmDebug
+	debug:=1
 endif
 
+fn:=app/src/main/java/com/five_ten_sg/connectbot/monitor/MonitorService.java
 
 all:
 	hg pull; hg update
@@ -65,6 +69,8 @@
 	convert app/src/main/res/drawable-ldpi/icon.png    -resize 50% -colorspace Gray app/src/main/res/drawable-ldpi/notification_icon.png
 
 indentc:
+	dos2unix $(na)
+	for i in $(na); do sed -i -e 's/\r//g' $$i; done
 	indent --line-length100 \
 		   --brace-indent4 \
 		   --braces-on-if-line \
@@ -73,15 +79,17 @@
 		   --case-indentation4 \
 		   --comment-indentation60 \
 		   --cuddle-else \
+		   --cuddle-do-while \
 		   --declaration-comment-column60 \
 		   --no-tabs \
 		   -nbbo \
 		   -npcs \
 		   -nprs \
 		   -npsl \
+		   -bad -bap -bbb -sob \
 		   -saf -sai -saw \
 		   -i4 \
-		   $(shell find . -iname *.c -o -iname *.h -o -iname *.cpp)
+		   $(na)
 
 
 indentjava:
@@ -93,9 +101,10 @@
 		--indent-cases \
 		--indent-namespaces \
 		--break-blocks \
+		--pad-oper \
+		--pad-first-paren-out \
+		--pad-header \
 		--unpad-paren \
-		--pad-oper \
-		--pad-header \
 		--delete-empty-lines \
 		--align-pointer=type \
 		--break-closing-brackets \
@@ -104,7 +113,7 @@
 		--convert-tabs \
 		--break-after-logical \
 		--mode=java \
-		   $(shell find . -iname *.java | grep -v /gen/)
+		   $(shell find . -iname '*.java' | grep -v /gen/)
 
 internaldocs:
 	doxygen