From adfc6adccc8889e6e872e37914928d9fec0692b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20E=C5=A1ler?= Date: Tue, 4 Jun 2019 08:41:05 +0200 Subject: [PATCH 1/3] fix highlighting for v2.9.* Get rid of message `Error in /usr/share/nano-syntax-highlighting/etc-hosts.nanorc on line 11: Color "normal" not understood.` after nano exits. --- etc-hosts.nanorc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc-hosts.nanorc b/etc-hosts.nanorc index eb8a51e..0c44bfd 100644 --- a/etc-hosts.nanorc +++ b/etc-hosts.nanorc @@ -8,7 +8,7 @@ color yellow "^[0-9\.]+\s" icolor green "^[0-9a-f:]+\s" # interpunction -color normal "[.:]" +color white "[.:]" # comments color brightblack "^#.*" From 3a9bb13bf4632aafafcf4f1dc4ca5a9987967e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondr=CC=8Cej=20Es=CC=8Cler?= Date: Tue, 23 Jul 2019 16:02:32 +0200 Subject: [PATCH 2/3] update documentation and installation script for v2.9 branch --- Readme.rst | 4 ++-- install.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Readme.rst b/Readme.rst index 7cb17a7..e6ee250 100644 --- a/Readme.rst +++ b/Readme.rst @@ -54,11 +54,11 @@ where ``$install_path`` is ``/usr/share/nano-syntax-highlighting`` or ``~/.nano/ ~~~~~~~~~~~~~~~~~~~~~~ Finally, you can run an automatic installer using the following code:: - $ curl https://raw.githubusercontent.com/scopatz/nanorc/master/install.sh | sh + $ curl https://raw.githubusercontent.com/scopatz/nanorc/v2.9/install.sh | sh or alternatively:: - $ wget https://raw.githubusercontent.com/scopatz/nanorc/master/install.sh -O- | sh + $ wget https://raw.githubusercontent.com/scopatz/nanorc/v2.9/install.sh -O- | sh *Note - some syntax definitions which exist in Nano upstream may be preferable to the ones provided by this package. diff --git a/install.sh b/install.sh index afb92d3..ae5fd25 100755 --- a/install.sh +++ b/install.sh @@ -7,7 +7,7 @@ if [ ! "$(command -v unzip)" ]; then fi _fetch_sources(){ - wget -O /tmp/nanorc.zip https://github.com/scopatz/nanorc/archive/master.zip + wget -O /tmp/nanorc.zip https://github.com/scopatz/nanorc/archive/v2.9.zip if [ ! -d ~/.nano/ ] then mkdir ~/.nano/ @@ -15,8 +15,8 @@ _fetch_sources(){ cd ~/.nano/ || exit unzip -o "/tmp/nanorc.zip" - mv nanorc-master/* ./ - rm -rf nanorc-master + mv nanorc-v2.9/* ./ + rm -rf nanorc-v2.9 rm /tmp/nanorc.zip } From ed8d78b74826221d67671cc74359213b626fbc8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20E=C5=A1ler?= Date: Tue, 23 Jul 2019 16:57:23 +0200 Subject: [PATCH 3/3] fix installation from git repo --- Readme.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Readme.rst b/Readme.rst index e6ee250..3bd6367 100644 --- a/Readme.rst +++ b/Readme.rst @@ -13,15 +13,15 @@ These should be placed inside of the ``~/.nano/`` directory. Or for system-wide installation ``/usr/share/nano-syntax-highlighting/``. In other words:: - git clone git@github.com:scopatz/nanorc.git ~/.nano + git clone --single-branch --branch=v2.9 git@github.com:scopatz/nanorc.git ~/.nano *Note - if you have any issues (ssh was not properly configured), alternatively use:: - git clone https://github.com/scopatz/nanorc.git ~/.nano + git clone --single-branch --branch=v2.9 https://github.com/scopatz/nanorc.git ~/.nano *System wide will look like so*:: - sudo git clone https://github.com/scopatz/nanorc.git /usr/share/nano-syntax-highlighting/ + sudo git clone --single-branch --branch=v2.9 https://github.com/scopatz/nanorc.git /usr/share/nano-syntax-highlighting/ **NOTE**: \< and \> are regular character escapes on macOS. The bug's fixed in Nano, but this might be a problem if you are using an older version. If this is the case, replace them respectively with [[:<:]] and [[:>:]].