Merge branch 'next' into 'master'

change scripts name to something less generic. Remove zenity

Closes #8 and #7

See merge request librem5-apps/librem5-goodies!10

Makefile

@@ -1,2 +1,2 @@
 all:
-	shellcheck contacts-importer screenshot
+	shellcheck l5-contacts-importer l5-screenshot

debian/control

@@ -22,6 +22,6 @@ Depends:
 Description: Librem 5 Goodies
  A collection of bash scripts and applications made to add functionalities to
  the Librem 5 phone and Phosh Shell. It includes the following:
-  - Contacts Importer: A simple application to import contacts from a vcard file
-    to GNOME Contacts.
-  - Screenshot: A simple application to make screenshots on the Librem 5
+  - L5 Contacts Importer: A simple application to import contacts from a vcard
+    file to GNOME Contacts.
+  - L5 Screenshot: A simple application to make screenshots on the Librem 5

debian/librem5-goodies.install

@@ -1,4 +1,4 @@
-contacts-importer /usr/bin
-contacts-importer.desktop /usr/share/applications
-screenshot /usr/bin
-screenshot.desktop /usr/share/applications
+l5-contacts-importer /usr/bin
+l5-contacts-importer.desktop /usr/share/applications
+l5-screenshot /usr/bin
+l5-screenshot.desktop /usr/share/applications

debian/tests/control

@@ -1,4 +1,3 @@
-Test-Command: /usr/bin/contacts-importer --help
+Test-Command: /usr/bin/l5-contacts-importer --help && /usr/bin/l5-screenshot --help
 Restrictions: superficial
-Depends:
- contacts-importer,
+Depends: librem5-goodies

l5-contacts-importer.desktop

@@ -2,6 +2,6 @@
 Name=Contacts Importer
 Type=Application
 Icon=preferences-desktop-personal
-Exec=/usr/bin/contacts-importer %U
+Exec=/usr/bin/l5-contacts-importer %U
 Categories=Utility;
 MimeType=text/x-vcard;

l5-screenshot

@@ -32,7 +32,7 @@ if [ -e /usr/bin/yad ]; then
   SCREENSHOT=$(echo "$INPUT" | cut -d '|' -f1)
   SECONDS=$(echo "$INPUT" | cut -d '|' -f2)
 else
-  SECONDS=$(zenity --title Screenshot --text="Take screenshot after X seconds" --entry-text=5 --entry)
+  SECONDS=$(yad --title Screenshot --text="Take screenshot after X seconds" --entry-text=5 --entry)
 fi
 
 if [ "$SECONDS" -eq 0 ]; then

l5-screenshot.desktop

@@ -2,5 +2,5 @@
 Name=Screen Shot
 Type=Application
 Icon=applets-screenshooter
-Exec=/usr/bin/screenshot %U
+Exec=/usr/bin/l5-screenshot %U
 Categories=Utility;