From 73aaf250bf0eac4a0a157217560f3aeea3249843 Mon Sep 17 00:00:00 2001
From: martmists <martmists@gmail.com>
Date: Mon, 6 Feb 2017 20:37:22 +0100
Subject: [PATCH] Using `shlex.split` to properly pass all arguments
---
owo/bg.py | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/owo/bg.py b/owo/bg.py
index 01de140..4dd2825 100644
--- a/owo/bg.py
+++ b/owo/bg.py
@@ -11,6 +11,7 @@ import owo
import os
import sys
import time
+import shlex
import subprocess
@@ -75,21 +76,25 @@ def main():
try:
# os.system won't raise an error
- subprocess.run((
- "termux-notification "
- '--title "File uploaded" '
- '--content "{0}" '
- '--button1 "Copy link" '
- '--button1-action "termux-clipboard-set {0}" '
- '--button2 "Share" '
- '--button2-action "termux-share {0}" ').format(url)
+ subprocess.run(
+ shlex.split((
+ "termux-notification "
+ '--title "File uploaded" '
+ '--content "{0}" '
+ '--button1 "Copy link" '
+ '--button1-action "termux-clipboard-set {0}" '
+ '--button2 "Share" '
+ '--button2-action "termux-share {0}" '
+ ).format(url))
)
print_v("Sent notification")
- except:
+ except FileNotFoundError:
+ # termux-api not installed
print("File uploaded: {}, URL: {}".format(
file, url))
else:
+ # Non-mobile devices
print("File uploaded: {}, URL: {}".format(
file, url))
--
GitLab