Merge pull request #1520 from freedomofpress/make-run-app

Add `make run-app`

Author: deeplow

Makefile

@@ -143,8 +143,8 @@ test-gpg: test-prereqs ## Runs tests for SD GPG functionality
 # Client autologin variables
 XDOTOOL_PATH=$(shell command -v xdotool)
 OATHTOOL_PATH=$(shell command -v oathtool)
-PHONY: run-client
-run-client: assert-dom0 ## Run client application (automatic login)
+.PHONY: run-deps
+run-deps:
 ifeq ($(XDOTOOL_PATH),)
 	@echo $(XDOTOOL_PATH)
 	@echo 'please install xdotool with "sudo qubes-dom0-update xdotool"'
@@ -154,6 +154,9 @@ ifeq ($(OATHTOOL_PATH),)
 	@echo 'please install oathtool with "sudo qubes-dom0-update oathtool"'
 	@false
 endif
+
+PHONY: run-client
+run-client: assert-dom0 run-deps ## Run client application (automatic login)
 	qvm-run --service sd-app qubes.StartApp+press.freedom.SecureDropClient
 	@sleep 3
 	@xdotool type "journalist"
@@ -164,6 +167,17 @@ endif
 	@xdotool type $(shell oathtool --totp --base32 JHCOGO7VCER3EJ4L)
 	@xdotool key Return
 
+PHONY: run-app
+run-app: assert-dom0 run-deps ## Run SecureDrop App (automatic login)
+	qvm-run --service sd-app qubes.StartApp+press.freedom.SecureDropApp
+	@sleep 5
+	@xdotool type "journalist"
+	@xdotool key Tab
+	@xdotool type "correct horse battery staple profanity oil chewy"
+	@xdotool key Tab
+	@xdotool type $(shell oathtool --totp --base32 JHCOGO7VCER3EJ4L)
+	@xdotool key Return
+
 # Not requiring dom0 for linting as that requires extra packages, which we're
 # not installing on dom0, so are only in the developer environment, i.e. Work VM
 

scripts/try-client-pr.py

@@ -163,7 +163,8 @@ def main():
     ).splitlines()
     subprocess.check_call(["qvm-shutdown", "--wait"] + all_vms)
     print(f"\n\nYour workstation is provisioned with PR #{args.pr_id}.")
-    print("\n\nYou can start the client with `make run-client`.")
+    target = "app" if args.app else "client"
+    print(f"\n\nYou can start the {target} with `make run-{target}`.")
 
 
 if __name__ == "__main__":