Re: [vdr] channels.conf overwritten when installing vdr 1.7.30
On 08.10.2012 21:47, Peter Münster wrote: On Mon, Oct 08 2012, Klaus Schmidinger wrote: +install-conf: + @cp *.conf $(DESTDIR)$(CONFDIR) What about @cp -n? Sounds like the right thing to do: --- --- Makefile2012/09/07 14:11:37 2.29 +++ Makefile2012/10/09 08:32:25 @@ -211,7 +211,7 @@ @mkdir -p $(DESTDIR)$(RESDIRDEF) install-conf: - @cp *.conf $(DESTDIR)$(CONFDIRDEF) + @cp -n *.conf $(DESTDIR)$(CONFDIRDEF) # Documentation: --- Klaus ___ vdr mailing list vdr@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
Re: [vdr] channels.conf overwritten when installing vdr 1.7.30
On 07.10.2012 18:27, Joachim Wilke wrote: Dear all, I just upgraded vdr from 1.7.29 to 1.7.31. After that I noticed that I lost my channels.conf as it was overwritten by make install. :-( A closer look to the changes made in 1.7.30 revealed that install-conf target in the Makefile no longer checks if the CONFDIR already exists. In previous version *.conf-files where only installed once (when the CONFDIR just was created). Was this change made by intention? This was part of the patch that introduced FHS compatibility: --- --- ./Makefile 2012/04/15 13:21:31 2.27 +++ ./Makefile 2012/09/01 13:22:33 ... @@ -193,12 +198,15 @@ # Configuration files: -install-conf: +install-dirs: @mkdir -p $(DESTDIR)$(VIDEODIR) - @if [ ! -d $(DESTDIR)$(CONFDIR) ]; then\ - mkdir -p $(DESTDIR)$(CONFDIR);\ - cp *.conf $(DESTDIR)$(CONFDIR);\ - fi + @mkdir -p $(DESTDIR)$(CONFDIR) + @mkdir -p $(DESTDIR)$(CACHEDIR) + @mkdir -p $(DESTDIR)$(RESDIR) + +install-conf: + @cp *.conf $(DESTDIR)$(CONFDIR) + # Documentation: --- Whether this was the intention of the patch author is beyond me. Since personally I don't install VDR and run it with only a single directory, I pretty much accept Makefile patches regarding installation as is. So if you have a suggestion on how to fix this, let's have it! Klaus ___ vdr mailing list vdr@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
Re: [vdr] channels.conf overwritten when installing vdr 1.7.30
This was part of the patch that introduced FHS compatibility: --- --- ./Makefile 2012/04/15 13:21:31 2.27 +++ ./Makefile 2012/09/01 13:22:33 ... @@ -193,12 +198,15 @@ # Configuration files: -install-conf: +install-dirs: @mkdir -p $(DESTDIR)$(VIDEODIR) - @if [ ! -d $(DESTDIR)$(CONFDIR) ]; then\ - mkdir -p $(DESTDIR)$(CONFDIR);\ - cp *.conf $(DESTDIR)$(CONFDIR);\ - fi + @mkdir -p $(DESTDIR)$(CONFDIR) + @mkdir -p $(DESTDIR)$(CACHEDIR) + @mkdir -p $(DESTDIR)$(RESDIR) + +install-conf: + @cp *.conf $(DESTDIR)$(CONFDIR) + # Documentation: --- Blindly overwriting files is terrible! The author of that FHS patch should fix it so those files are only copied if they don't already exist. ___ vdr mailing list vdr@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
Re: [vdr] channels.conf overwritten when installing vdr 1.7.30
2012/10/8 VDR User user@gmail.com: Blindly overwriting files is terrible! The author of that FHS patch should fix it so those files are only copied if they don't already exist. Here's a patch which reverts this small misbehaviour. Christopher Reimer vdr-1.7.31-do-not-overwrite-confs.diff Description: Binary data ___ vdr mailing list vdr@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
Re: [vdr] channels.conf overwritten when installing vdr 1.7.30
On Mon, Oct 08 2012, Klaus Schmidinger wrote: +install-conf: + @cp *.conf $(DESTDIR)$(CONFDIR) What about @cp -n? -- Peter ___ vdr mailing list vdr@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
[vdr] channels.conf overwritten when installing vdr 1.7.30
Dear all, I just upgraded vdr from 1.7.29 to 1.7.31. After that I noticed that I lost my channels.conf as it was overwritten by make install. :-( A closer look to the changes made in 1.7.30 revealed that install-conf target in the Makefile no longer checks if the CONFDIR already exists. In previous version *.conf-files where only installed once (when the CONFDIR just was created). Was this change made by intention? -- Best Regards, Joachim. ___ vdr mailing list vdr@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
Re: [vdr] channels.conf overwritten when installing vdr 1.7.30
Am 07.10.2012 18:27, schrieb Joachim Wilke: Dear all, I just upgraded vdr from 1.7.29 to 1.7.31. After that I noticed that I lost my channels.conf as it was overwritten by make install. :-( A closer look to the changes made in 1.7.30 revealed that install-conf target in the Makefile no longer checks if the CONFDIR already exists. In previous version *.conf-files where only installed once (when the CONFDIR just was created). The same applies also for disecq.conf and scr.conf Best Regards Uli -- Ulrich Eckhardt http://www.uli-eckhardt.de Ein Blitzableiter auf dem Kirchturm ist das denkbar stärkste Misstrauensvotum gegen den lieben Gott. (Karl Krauss) ___ vdr mailing list vdr@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
