summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgxb1522020-05-05 14:33:17 +0800
committergxb1522020-05-05 14:33:17 +0800
commit59c095a08aaf9cd669acfd7b2007c492f674f8f2 (patch)
tree695a3cbb7dc674137c8e18cebe4b9c4fab0c99e0
parent1456bf77860514cebead31feccb047450f865b97 (diff)
downloadaur-59c095a08aaf9cd669acfd7b2007c492f674f8f2.tar.gz
fix bug
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rwxr-xr-xblack_pycharm_formatter.sh11
-rwxr-xr-xblack_pycharm_jupyter_cell_formatter.sh6
4 files changed, 16 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2bef8e5b8212..a9221e960dd3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,8 +2,8 @@ pkgbase = mtaaat
pkgver = 1.0
pkgrel = 1
arch = any
- source = black_pycharm_jupyter_cell_formatter.sh
- sha256sums = 73d9d04d4497c0b1f943d8851440fcb715ad70ed2b0fc215e5aba475584d74b1
+ source = black_pycharm_formatter.sh
+ sha256sums = 2be1e7f863d7b1f8eac66237577e66de83f695253cafea866762bb106b6be414
pkgname = mtaaat
diff --git a/PKGBUILD b/PKGBUILD
index 55f6147b9575..444c94c4461a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@ pkgname=mtaaat
pkgver=1.0
pkgrel=1
arch=('any')
-source=("black_pycharm_jupyter_cell_formatter.sh")
-sha256sums=('73d9d04d4497c0b1f943d8851440fcb715ad70ed2b0fc215e5aba475584d74b1')
+source=("black_pycharm_formatter.sh")
+sha256sums=('2be1e7f863d7b1f8eac66237577e66de83f695253cafea866762bb106b6be414')
package() {
- install -Dm755 $srcdir/black_pycharm_jupyter_cell_formatter.sh $pkgdir/usr/bin/black_pycharm_jupyter_cell_formatter.sh
+ install -Dm755 $srcdir/black_pycharm_formatter.sh $pkgdir/usr/bin/black_pycharm_formatter.sh
}
diff --git a/black_pycharm_formatter.sh b/black_pycharm_formatter.sh
new file mode 100755
index 000000000000..a176fc381f49
--- /dev/null
+++ b/black_pycharm_formatter.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+case $2 in
+ "py")
+ black -l 80 -S $1
+ ;;
+ "ipynb")
+ cmd="$3/jupytext"
+ $cmd $1 --pipe "black -l 80 -S {}"
+ ;;
+esac
diff --git a/black_pycharm_jupyter_cell_formatter.sh b/black_pycharm_jupyter_cell_formatter.sh
deleted file mode 100755
index f2d91db7ad84..000000000000
--- a/black_pycharm_jupyter_cell_formatter.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-output=$(black -l 80 -S -c "$1" 2> /dev/null)
-if [ $? -eq 0 ]; then
- echo "$output" | xsel -b
-fi
-