From d3ebc8253ee4bfbd9deddd7bbb90b18522bea5a4 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Tue, 20 Apr 2021 23:34:06 -0500 Subject: system/ranger: use python3 by default now --- system/ranger/README | 8 +------- system/ranger/ranger.SlackBuild | 7 ++----- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/system/ranger/README b/system/ranger/README index 545d99c70c..3feef1f951 100644 --- a/system/ranger/README +++ b/system/ranger/README @@ -12,13 +12,7 @@ Optional Helpers: w3m (for inline display of images) atool (for listing files inside archives in the preview pane) -highlight or (python3-)Pygments (for coloured previews) +highlight (for coloured previews) (Note that highlight is used by default. Pygments requires editing the preview script 'scope.sh') - -Options: - -To build for python3, use: - -PYTHON3=yes ./ranger.SlackBuild diff --git a/system/ranger/ranger.SlackBuild b/system/ranger/ranger.SlackBuild index a016f269c6..8cc3118173 100644 --- a/system/ranger/ranger.SlackBuild +++ b/system/ranger/ranger.SlackBuild @@ -70,20 +70,17 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -[ "$PYTHON3" = "yes" ] && PY=3 -PYVER=$(python$PY -V 2>&1 | sed -nr "s,.* ([0-9]\.[0-9]).*,\1,p") - # Fix some incorrect paths in man page sed -i " s,doc/configs,/usr/doc/$PRGNAM-$VERSION/config, - s,usr/share/doc/ranger/config,usr/lib64/python$PYVER/site-packages/ranger/config, + s,usr/share/doc/ranger/config,usr/lib64/python3/site-packages/ranger/config, s,\\\\fIexamples,\\\\fI/usr/doc-$PRGNAM-$VERSION/examples, s,They are usually installed to,, 0,/\\\\&\\\\fI\/usr\/share\/doc\/ranger\/examples\\\\fR./s,,, s,/usr/share/doc/ranger/examples/,/usr/doc-$PRGNAM-$VERSION/examples, " doc/ranger.1 -python$PY setup.py install -O1 --root=$PKG +python3 setup.py install -O1 --root=$PKG mv $PKG/usr/share/man $PKG/usr -- cgit v1.2.3