Rename qcmd and dqcmd to qtile-cmd and dqtile-cmd

Fixes #1153

CHANGELOG

@@ -2,6 +2,8 @@ qtile 0.x.x, released xxxx-xx-xx:
     !!! Config breakage !!!
         - Tile layout commands up/down/shuffle_up/shuffle_down changed to be
           more consistent with other layouts
+        - move qcmd to qtile-cmd because of conflict with renameutils, move
+          dqcmd to dqtile-cmd for symmetry
     * features
         - add `add_after_last` option to Tile layout to add windows to the end
           of the list.

MANIFEST.in

@@ -20,7 +20,7 @@ prune docs
 prune scripts
 prune test
 prune rpm
-include bin/dqcmd
+include bin/dqtile-cmd
 include bin/iqshell
 
 recursive-exclude * __pycache__

bin/dqtile-cmd

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 usage() {
-    echo "$(tput bold)dqcmd$(tput sgr0)
+    echo "$(tput bold)dqtile-cmd$(tput sgr0)
 
-    A Rofi/dmenu interface to qcmd. Accepts all arguments of qcmd (see below).
+    A Rofi/dmenu interface to qtile-cmd. Accepts all arguments of qtile-cmd (see below).
 
     "
 
-    qcmd -h | sed "s/qcmd/dqcmd/"
+    qtile-cmd -h | sed "s/qtile-cmd/dqtile-cmd/"
 
 
     echo "
@@ -21,7 +21,7 @@ case $1 in
     --force-dmenu) FORCE_DMENU=1; shift;;
 esac
 
-action=$(qcmd $@)
+action=$(qtile-cmd $@)
 
 # Path to menu application
 if [[ -n $(command -v rofi) ]]  && [[ -z "$FORCE_DMENU" ]]; then
@@ -45,7 +45,7 @@ action=$(echo "$action"| cut -f 1 |  sed -e 's/ *$//g')
 if [ "$action_info" -eq "10" ]; then
     # only run when -f is present (then -i makes sense)
     if [[ $action == *"-f"* ]]; then
-        info=$(qcmd $action -i)
+        info=$(qtile-cmd $action -i)
         action=$($menu -mesg "$global_mesg
<b>Help</b>
$info" -filter "$action -a ")
     fi;
 fi;

bin/qtile-cmd

@@ -8,5 +8,5 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
 sys.path.insert(0, base_dir)
 
 if __name__ == '__main__':
-    from libqtile.scripts import qcmd
-    qcmd.main()
+    from libqtile.scripts import qtile_cmd
+    qtile_cmd.main()

docs/index.rst

@@ -24,8 +24,8 @@ Commands and scripting
     manual/commands/iqshell
     manual/commands/qtile-top
     manual/commands/qtile-run
-    manual/commands/qcmd
-    manual/commands/dqcmd
+    manual/commands/qtile-cmd
+    manual/commands/dqtile-cmd
 
 Getting involved
 ================

docs/manual/commands/dqtile-cmd.rst

@@ -1,27 +1,28 @@
-dqcmd
-=====
+dqtile-cmd
+==========
 
-A Rofi/dmenu interface to qcmd. Accepts all arguments of qcmd.
+A Rofi/dmenu interface to qtile-cmd. Accepts all arguments of qtile-cmd.
 
 Examples:
 ---------
 
-Output of ``dqcmd -o cmd``
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+Output of ``dqtile-cmd -o cmd``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. image:: dqcmd.png
+.. image:: dqtile-cmd.png
 
-Output of ``dqcmd -h``
-~~~~~~~~~~~~~~~~~~~~~~
+Output of ``dqtile-cmd -h``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. code:: text
 
-    dqcmd
+    dqtile-cmd
 
-        A Rofi/dmenu interface to qcmd. Excepts all arguments o qcmd (see below).
+        A Rofi/dmenu interface to qtile-cmd. Excepts all arguments of qtile-cmd
+        (see below).
 
-    usage: dqcmd [-h] [--object OBJ_SPEC [OBJ_SPEC ...]] [--function FUNCTION]
-                [--args ARGS [ARGS ...]] [--info]
+    usage: dqtile-cmd [-h] [--object OBJ_SPEC [OBJ_SPEC ...]]
+                      [--function FUNCTION] [--args ARGS [ARGS ...]] [--info]
 
     Simple tool to expose qtile.command functionality to shell.
 
@@ -38,10 +39,10 @@ Output of ``dqcmd -h``
                             documentation for function.
 
     Examples:
-     dqcmd
-     dqcmd -o cmd
-     dqcmd -o cmd -f prev_layout -i
-     dqcmd -o cmd -f prev_layout -a 3 # prev_layout on group 3
-     dqcmd -o group 3 -f focus_back
+     dqtile-cmd
+     dqtile-cmd -o cmd
+     dqtile-cmd -o cmd -f prev_layout -i
+     dqtile-cmd -o cmd -f prev_layout -a 3 # prev_layout on group 3
+     dqtile-cmd -o group 3 -f focus_back
 
     If both rofi and dmenu are present rofi will be selected as default, to change this us --force-dmenu as the first argument.

docs/manual/commands/qtile-cmd.rst

@@ -1,5 +1,5 @@
-qcmd
-====
+qtile-cmd
+=========
 
 This is a simple tool to expose qtile.command functionality to shell.
 This can be used standalone or in other shell scripts.
@@ -7,13 +7,13 @@ This can be used standalone or in other shell scripts.
 Examples:
 ---------
 
-Output of ``qcmd -h``
-~~~~~~~~~~~~~~~~~~~~~
+Output of ``qtile-cmd -h``
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. code:: text
 
-    usage: qcmd [-h] [--object OBJ_SPEC [OBJ_SPEC ...]] [--function FUNCTION]
-                [--args ARGS [ARGS ...]] [--info]
+    usage: qtile-cmd [-h] [--object OBJ_SPEC [OBJ_SPEC ...]]
+                     [--function FUNCTION] [--args ARGS [ARGS ...]] [--info]
 
     Simple tool to expose qtile.command functionality to shell.
 
@@ -30,14 +30,14 @@ Output of ``qcmd -h``
                             documentation for function.
 
     Examples:
-     qcmd
-     qcmd -o cmd
-     qcmd -o cmd -f prev_layout -i
-     qcmd -o cmd -f prev_layout -a 3 # prev_layout on group 3
-     qcmd -o group 3 -f focus_back
+     qtile-cmd
+     qtile-cmd -o cmd
+     qtile-cmd -o cmd -f prev_layout -i
+     qtile-cmd -o cmd -f prev_layout -a 3 # prev_layout on group 3
+     qtile-cmd -o group 3 -f focus_back
 
-Output of ``qcmd -o group 3``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Output of ``qtile-cmd -o group 3``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. code:: text
 
@@ -58,8 +58,8 @@ Output of ``qcmd -o group 3``
     -o group 3 -f toscreen          * Pull a group to a specified screen.
     -o group 3 -f unminimize_all      Unminimise all windows in this group
 
-Output of ``qcmd -o cmd``
-~~~~~~~~~~~~~~~~~~~~~~~~~
+Output of ``qtile-cmd -o cmd``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. code:: text
 

libqtile/scripts/qtile_cmd.py

@@ -150,11 +150,11 @@ def main():
     description = 'Simple tool to expose qtile.command functionality to shell.'
     epilog = '''\
 Examples:\n\
- qcmd\n\
- qcmd -o cmd\n\
- qcmd -o cmd -f prev_layout -i\n\
- qcmd -o cmd -f prev_layout -a 3 # prev_layout on group 3\n\
- qcmd -o group 3 -f focus_back\n
+ qtile-cmd\n\
+ qtile-cmd -o cmd\n\
+ qtile-cmd -o cmd -f prev_layout -i\n\
+ qtile-cmd -o cmd -f prev_layout -a 3 # prev_layout on group 3\n\
+ qtile-cmd -o group 3 -f focus_back\n
 '''
     fmt = argparse.RawDescriptionHelpFormatter
 

setup.py

@@ -141,16 +141,16 @@ setup(
     ]},
     entry_points={
         'console_scripts': [
+            'qshell = libqtile.scripts.qshell:main',
             'qtile = libqtile.scripts.qtile:main',
+            'qtile-cmd = libqtile.scripts.qtile_cmd:main',
             'qtile-run = libqtile.scripts.qtile_run:main',
             'qtile-top = libqtile.scripts.qtile_top:main',
-            'qshell = libqtile.scripts.qshell:main',
-            'qcmd = libqtile.scripts.qcmd:main',
         ]
     },
     scripts=[
+        'bin/dqtile-cmd',
         'bin/iqshell',
-        'bin/dqcmd',
     ],
     data_files=[
         ('share/man/man1', ['resources/qtile.1',