From a984a93e616fa37f06d4e79e3530913793e09a8d Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Thu, 20 Feb 2020 16:33:45 +0100
Subject: [PATCH] python[23]-wrapper: Set default to python3

Default /usr/bin commands which are available from python2 and from
python3 to python3.
---
 python2-wrapper.be0 | 21 +++------------------
 python3-wrapper.be0 | 26 ++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/python2-wrapper.be0 b/python2-wrapper.be0
index 5350482ca..5cca5a4d4 100755
--- a/python2-wrapper.be0
+++ b/python2-wrapper.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION python2-wrapper-1.2-0
+# BEE_VERSION python2-wrapper-1.3-0
 
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
@@ -68,30 +68,15 @@ mee_build() {
 mee_install() {
     mkdir -p "$D$BINDIR"
     for cmd in \
-        idle \
-        pydoc \
-        python \
-        python-config \
-        ipython \
+        python2-config \
         python2 \
         ipython2 \
-        jupyter \
         macs2 \
-        htseq-count \
-        htseq-qa \
-        umi_tools \
         gnome-doc-prepare \
         xml2po \
         gnome-doc-tool \
         pssh \
-        iotop \
-        rst2html.py rst2html4.py rst2html5.py \
-        rst2latex.py rst2xetex.py \
-        rst2man.py \
-        rst2odt.py rst2odt_prepstyles.py \
-        rst2pseudoxml.py rst2xml.py \
-        rst2s5.py \
-        rstpep2html.py
+        iotop
     do
         ln "$B/wrapper" "$D$BINDIR/$cmd"
     done
diff --git a/python3-wrapper.be0 b/python3-wrapper.be0
index 105ceaa86..59e2977bf 100755
--- a/python3-wrapper.be0
+++ b/python3-wrapper.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION python3-wrapper-1.0-0
+# BEE_VERSION python3-wrapper-1.1-0
 
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
@@ -68,7 +68,7 @@ create_bin_wrapper() {
     if [ -z "$target" ]; then
         ln "$B/wrapper" "$D$BINDIR/$cmd"
     else
-        echo -e '#! /bin/bash\nprun python3 "$target" "$@"' > "$D$BINDIR/$cmd"
+        echo -e "#! /bin/bash\nprun python3 \"$target\" \"\$@\"" > "$D$BINDIR/$cmd"
         chmod +x "$D$BINDIR/$cmd"
     fi
 }
@@ -84,6 +84,28 @@ mee_install() {
 
     create_bin_wrapper ipython3
     create_bin_wrapper meson
+
+    create_bin_wrapper idle idle3
+    create_bin_wrapper pydoc pydoc3
+    create_bin_wrapper python python3
+    create_bin_wrapper python-config python3-config
+
+    for cmd in \
+        ipython \
+        jupyter \
+        htseq-count \
+        htseq-qa \
+        umi_tools \
+        rst2html.py rst2html4.py rst2html5.py \
+        rst2latex.py rst2xetex.py \
+        rst2man.py \
+        rst2odt.py rst2odt_prepstyles.py \
+        rst2pseudoxml.py rst2xml.py \
+        rst2s5.py \
+        rstpep2html.py
+    do
+        ln "$B/wrapper" "$D$BINDIR/$cmd"
+    done
 }
 ## by default this may be 'make install DESTDIR="${D}"'