forgotten conflict

README.markdown

@@ -198,3 +198,4 @@ Or for zsh users, append to `~/.zshrc`:
 Add to `~/.config/fish/config.fish` or in a new file in `~/.config/fish/conf.d/`:
 
     source /usr/local/etc/grc.fish
+

colourfiles/conf.sensors

@@ -0,0 +1,12 @@
+# Adapetr
+regexp=Adapter:\s(.*)
+colours=default, green
+======
+# High temperature
+regexp=.+:\s+(\+[67][0-9][^0-9])
+colours=default, red
+======
+# Very high temperature
+regexp=.+:\s+(\+[89][0-9][0-9]?)
+colours=default, blink red
+======

debian/changelog

@@ -1,8 +1,13 @@
+grc (1.11.1-2) unstable; urgency=low
+
+  * fixed python2 compatibility errors (forgotten old changelog commit)
+ -- Radovan Garabík <garabik@kassiopeia.juls.savba.sk>  Wed, 07 Jun 2017 15:01:11 +0200
+
 grc (1.11.1-1) unstable; urgency=low
 
   * fixed python2 compatibility errors
 
- -- Radovan Garabík <garabik@kassiopeia.juls.savba.sk>  Thu, 04 May 2017 11:11:11 +0200
+ -- Radovan Garabík <garabik@kassiopeia.juls.savba.sk>  Sun, 21 May 2017 16:01:51 +0200
 
 grc (1.11-1) unstable; urgency=low
 

grc

@@ -137,7 +137,11 @@ if cfile != "" and colour:
                 os.dup2(chie, 2)
                 os.close(choe)
                 os.close(chie)
-        os.execvp(args[0], args)
+        try:
+            os.execvp(args[0], args)
+        except OSError as e:
+            sys.stderr.write('grc: %s: %s\n' % (args[0], e.strerror))
+            sys.exit(1)
 
 
     if stdoutff:

install.sh

@@ -21,7 +21,8 @@ cp -fv grc.1 $MANDIR/man1
 cp -fv grcat.1 $MANDIR/man1
 mkdir -p $CONFDIR
 cp -fv grc.conf $CONFDIR
+cp -fv grc.zsh $CONFDIR
+cp -fv grc.fish $CONFDIR
 mkdir -p $PROFILEDIR
 cp -fv grc.bashrc $PROFILEDIR
 
-