From f58e81288b2138d1b532cf11fb95bbcbac362a4e Mon Sep 17 00:00:00 2001
From: Maxim Karasev <begs@disroot.org>
Date: Wed, 29 Sep 2021 23:56:52 +0300
Subject: Rename imv-folder to imv-dir

There is no such thing as 'folder' in Unix. We only have directories
(also sometimes called 'catalogs').
---
 contrib/imv-dir          |  2 ++
 contrib/imv-folder       |  2 --
 doc/imv-dir.1.txt        | 36 ++++++++++++++++++++++++++++++++++++
 doc/imv-folder.1.txt     | 36 ------------------------------------
 doc/imv.1.txt            |  2 +-
 files/imv-dir.desktop    | 14 ++++++++++++++
 files/imv-folder.desktop | 14 --------------
 meson.build              |  6 +++---
 8 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100755 contrib/imv-dir
 delete mode 100755 contrib/imv-folder
 create mode 100644 doc/imv-dir.1.txt
 delete mode 100644 doc/imv-folder.1.txt
 create mode 100644 files/imv-dir.desktop
 delete mode 100644 files/imv-folder.desktop

diff --git a/contrib/imv-dir b/contrib/imv-dir
new file mode 100755
index 0000000..d9fb46f
--- /dev/null
+++ b/contrib/imv-dir
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec imv -n "$1" "$(dirname "$1")"
diff --git a/contrib/imv-folder b/contrib/imv-folder
deleted file mode 100755
index d9fb46f..0000000
--- a/contrib/imv-folder
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec imv -n "$1" "$(dirname "$1")"
diff --git a/doc/imv-dir.1.txt b/doc/imv-dir.1.txt
new file mode 100644
index 0000000..16f6b95
--- /dev/null
+++ b/doc/imv-dir.1.txt
@@ -0,0 +1,36 @@
+/////
+vim:set ts=4 sw=4 tw=82 noet:
+/////
+:quotes.~:
+
+imv (1)
+=======
+
+Name
+----
+imv-dir - Open 'imv' for all images in a directory
+
+Description
+-----------
+
+'imv-dir' is a wrapper for 'imv' that auto-selects the directory where the image is located, so that the *next* and *previous* commands function in the same way as other image viewers.
+
+Note that this wrapper supports only a single image. For opening multiple images, use plain `imv`.
+
+Synopsis
+--------
+'imv-dir' path
+
+Authors
+-------
+
+imv is written and maintained by Harry Jeffery <me@harry.pm>
+with contributions from other developers.
+
+Full source code and other information can be found at
+<https://github.com/eXeC64/imv>.
+
+See Also
+--------
+
+**imv**(1)
diff --git a/doc/imv-folder.1.txt b/doc/imv-folder.1.txt
deleted file mode 100644
index a9d627b..0000000
--- a/doc/imv-folder.1.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-/////
-vim:set ts=4 sw=4 tw=82 noet:
-/////
-:quotes.~:
-
-imv (1)
-=======
-
-Name
-----
-imv-folder - Open 'imv' for all images in a folder
-
-Description
------------
-
-'imv-folder' is a wrapper for 'imv' that auto-selects the folder where the image is located, so that the *next* and *previous* commands function in the same way as other image viewers.
-
-Note that this wrapper supports only a single image. For opening multiple images, use plain `imv`.
-
-Synopsis
---------
-'imv-folder' path
-
-Authors
--------
-
-imv is written and maintained by Harry Jeffery <me@harry.pm>
-with contributions from other developers.
-
-Full source code and other information can be found at
-<https://github.com/eXeC64/imv>.
-
-See Also
---------
-
-**imv**(1)
diff --git a/doc/imv.1.txt b/doc/imv.1.txt
index cc79e71..db7e7e2 100644
--- a/doc/imv.1.txt
+++ b/doc/imv.1.txt
@@ -330,4 +330,4 @@ Full source code and other information can be found at
 See Also
 --------
 
-**imv**(5) **imv-msg**(1) **imv-folder**(1)
+**imv**(5) **imv-msg**(1) **imv-dir**(1)
diff --git a/files/imv-dir.desktop b/files/imv-dir.desktop
new file mode 100644
index 0000000..5f04f86
--- /dev/null
+++ b/files/imv-dir.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=imv-dir
+Name[en_US]=imv
+GenericName=Image viewer
+GenericName[en_US]=Image viewer
+Comment=Fast freeimage-based Image Viewer | Open all images in a directory
+Exec=imv-dir %f
+NoDisplay=true
+Terminal=false
+Type=Application
+Categories=Graphics;2DGraphics;Viewer;
+MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-tga;image/x-xbitmap;
+Icon=multimedia-photo-viewer
+Keywords=photo;picture;
diff --git a/files/imv-folder.desktop b/files/imv-folder.desktop
deleted file mode 100644
index 4bec770..0000000
--- a/files/imv-folder.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=imv-folder
-Name[en_US]=imv
-GenericName=Image viewer
-GenericName[en_US]=Image viewer
-Comment=Fast freeimage-based Image Viewer | Open all images on a folder
-Exec=imv-folder %f
-NoDisplay=true
-Terminal=false
-Type=Application
-Categories=Graphics;2DGraphics;Viewer;
-MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-pcx;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-tga;image/x-xbitmap;
-Icon=multimedia-photo-viewer
-Keywords=photo;picture;
diff --git a/meson.build b/meson.build
index 840ff60..7cf64b5 100644
--- a/meson.build
+++ b/meson.build
@@ -159,7 +159,7 @@ endforeach
 
 if get_option('contrib-commands')
   install_data(
-    files('contrib/imv-folder'),
+    files('contrib/imv-dir'),
     install_dir: get_option('bindir'),
     install_mode: 'rwxr-xr-x',
   )
@@ -178,7 +178,7 @@ desktop_list = [
 ]
 if get_option('contrib-commands')
   desktop_list += [
-    'imv-folder',
+    'imv-dir',
   ]
 endif
 foreach desktop: desktop_list
@@ -221,7 +221,7 @@ if prog_a2x.found()
   ]
   if get_option('contrib-commands')
     man_list += [
-      [1, 'imv-folder'],
+      [1, 'imv-dir'],
     ]
   endif
 
-- 
cgit v1.2.3