]> git.phdru.name Git - dotfiles.git/commitdiff
Fix(bin/cp_recode_fname): Fix misspelled message master
authorOleg Broytman <phd@phdru.name>
Fri, 3 May 2024 21:51:57 +0000 (00:51 +0300)
committerOleg Broytman <phd@phdru.name>
Fri, 3 May 2024 21:51:57 +0000 (00:51 +0300)
bin/cp_recode_fname
bin/mplay
bin/recode-filenames-recursive.py

index 8cae733e8642c03a8b6f90dcdd2eec230762cfa7..d6dd74b8f0398574784dc8a25b987f554be81720 100755 (executable)
@@ -31,7 +31,7 @@ case "$cmd" in
     cp_*) cmd="cp -p" ;;
     mv_*) cmd=mv ;;
     *)
-        echo "Uncnown command $0, aborting" >&2
+        echo "Unknown command $0, aborting" >&2
         exit 2
     ;;
 esac
index e4ca11004c5b1d39c3198b168f33c776fa48261c..decfbfe8e22fa83a39d12f50821d116c571a4a92 100755 (executable)
--- a/bin/mplay
+++ b/bin/mplay
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-options="--ao pulse --quiet"
+options="--ao=pulse --quiet"
 
 if [ -n "$AUDIO_VOLUME" ]; then
    options="$options --af=loudnorm --volume=$AUDIO_VOLUME"
index b7787e491cea8b6c53d3863dcab94dd0b7c96b56..54085636506bf1f642663a8fc5697541a762935b 100755 (executable)
@@ -1,14 +1,34 @@
 #! /usr/bin/env python3
 
 import sys, os
-from recode_filenames import _recode
 
-if len(sys.argv) == 3:
+from m_lib.defenc import default_encoding
+
+if len(sys.argv) == 1:
+    src_encoding = default_encoding
+    if src_encoding == 'utf-8':
+        sys.exit("Usage: %s [[src_enc] dst_enc [start_dir]]" % sys.argv[0])
+    else:
+        dst_encoding = 'utf-8'
+    start_dir = '.'
+elif len(sys.argv) == 2:
+    src_encoding = default_encoding
+    dst_encoding = sys.argv[1]
     start_dir = '.'
+elif len(sys.argv) == 3:
+    src_encoding = default_encoding
+    dst_encoding = sys.argv[1]
+    start_dir = sys.argv[2]
 elif len(sys.argv) == 4:
+    src_encoding = sys.argv[1]
+    dst_encoding = sys.argv[2]
     start_dir = sys.argv[3]
 else:
-    sys.exit("Usage: %s src_enc dst_enc [start_dir]" % sys.argv[0])
+    sys.exit("Usage: %s [[src_enc] dst_enc [start_dir]]" % sys.argv[0])
+
+# Fake for recode_filenames.py
+sys.argv = ['', src_encoding, dst_encoding]
+from recode_filenames import _recode
 
 
 def _onerror(exc):