| Message ID | 20171103215510.32216-1-tim@tn-x.org |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange b/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange index 9aeb434..30963ae 100644 --- a/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange +++ b/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange @@ -6,7 +6,6 @@ hoodfile="/tmp/keyxchangev2data" hoodfilecopy="/www/hood/keyxchangev2data" -hiddenapfile="/tmp/hiddenapflag" getJsonPath() { jsonfile="" diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood index 42eb966..b10d210 100755 --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood @@ -9,6 +9,7 @@ sectorlocal=/etc/sectorfile sectortmp=/tmp/sectorfile sectorcopy=/www/hood/sectorfile +hiddenapfile=/tmp/hiddenapflag rm -f "$hoodfile"
hi macht Sinn da die Variable auch dort verwendet wird und nicht in der lib. Reviewed-by: Christian Dresel <fff@chrisi01.de> mfg Christian On 03.11.2017 22:55, Tim Niemeyer wrote: > Move the variable definition to the implementation file. This is more > intuitive and the variable is not used otherwise. > > Signed-off-by: Tim Niemeyer <tim@tn-x.org> > --- > > Changes in v2: > - move variable from lib/functions/fff/keyxchange > > src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange | 1 - > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange b/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange > index 9aeb434..30963ae 100644 > --- a/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange > +++ b/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange > @@ -6,7 +6,6 @@ > > hoodfile="/tmp/keyxchangev2data" > hoodfilecopy="/www/hood/keyxchangev2data" > -hiddenapfile="/tmp/hiddenapflag" > > getJsonPath() { > jsonfile="" > diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > index 42eb966..b10d210 100755 > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > @@ -9,6 +9,7 @@ > sectorlocal=/etc/sectorfile > sectortmp=/tmp/sectorfile > sectorcopy=/www/hood/sectorfile > +hiddenapfile=/tmp/hiddenapflag > > rm -f "$hoodfile" > >
Hallo, ich finde zwar, der gehört in den anderen File. Aber wenn ihr es beide so seht, macht ruhig. Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf > Of Christian Dresel > Sent: Samstag, 4. November 2017 13:27 > To: Tim Niemeyer <tim@tn-x.org>; franken-dev@freifunk.net > Subject: Re: [PATCH v2] fff-hoods: move hiddenapfile variable > > hi > > macht Sinn da die Variable auch dort verwendet wird und nicht in der lib. > > Reviewed-by: Christian Dresel <fff@chrisi01.de> > > mfg > > Christian > > On 03.11.2017 22:55, Tim Niemeyer wrote: > > Move the variable definition to the implementation file. This is more > > intuitive and the variable is not used otherwise. > > > > Signed-off-by: Tim Niemeyer <tim@tn-x.org> > > --- > > > > Changes in v2: > > - move variable from lib/functions/fff/keyxchange > > > > src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange | 1 - > > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 1 + > > 2 files changed, 1 insertion(+), 1 deletion(-) > > > > diff --git > > a/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange > > b/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange > > index 9aeb434..30963ae 100644 > > --- a/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange > > +++ b/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange > > @@ -6,7 +6,6 @@ > > > > hoodfile="/tmp/keyxchangev2data" > > hoodfilecopy="/www/hood/keyxchangev2data" > > -hiddenapfile="/tmp/hiddenapflag" > > > > getJsonPath() { > > jsonfile="" > > diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > index 42eb966..b10d210 100755 > > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > @@ -9,6 +9,7 @@ > > sectorlocal=/etc/sectorfile > > sectortmp=/tmp/sectorfile > > sectorcopy=/www/hood/sectorfile > > +hiddenapfile=/tmp/hiddenapflag > > > > rm -f "$hoodfile" > > > >
Am Samstag, den 04.11.2017, 14:58 +0100 schrieb mail@adrianschmutzler.de: > Hallo, ich finde zwar, der gehört in den anderen File. Aber wenn ihr > es beide so seht, macht ruhig. > > Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Danke Und applied. Tim > > > -----Original Message----- > > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On > > Behalf > > Of Christian Dresel > > Sent: Samstag, 4. November 2017 13:27 > > To: Tim Niemeyer <tim@tn-x.org>; franken-dev@freifunk.net > > Subject: Re: [PATCH v2] fff-hoods: move hiddenapfile variable > > > > hi > > > > macht Sinn da die Variable auch dort verwendet wird und nicht in > > der lib. > > > > Reviewed-by: Christian Dresel <fff@chrisi01.de> > > > > mfg > > > > Christian > > > > On 03.11.2017 22:55, Tim Niemeyer wrote: > > > Move the variable definition to the implementation file. This is > > > more > > > intuitive and the variable is not used otherwise. > > > > > > Signed-off-by: Tim Niemeyer <tim@tn-x.org> > > > --- > > > > > > Changes in v2: > > > - move variable from lib/functions/fff/keyxchange > > > > > > src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange | > > > 1 - > > > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | > > > 1 + > > > 2 files changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git > > > a/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange > > > b/src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange > > > index 9aeb434..30963ae 100644 > > > --- a/src/packages/fff/fff- > > > hoods/files/lib/functions/fff/keyxchange > > > +++ b/src/packages/fff/fff- > > > hoods/files/lib/functions/fff/keyxchange > > > @@ -6,7 +6,6 @@ > > > > > > hoodfile="/tmp/keyxchangev2data" > > > hoodfilecopy="/www/hood/keyxchangev2data" > > > -hiddenapfile="/tmp/hiddenapflag" > > > > > > getJsonPath() { > > > jsonfile="" > > > diff --git a/src/packages/fff/fff- > > > hoods/files/usr/sbin/configurehood > > > b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > > index 42eb966..b10d210 100755 > > > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > > @@ -9,6 +9,7 @@ > > > sectorlocal=/etc/sectorfile > > > sectortmp=/tmp/sectorfile > > > sectorcopy=/www/hood/sectorfile > > > +hiddenapfile=/tmp/hiddenapflag > > > > > > rm -f "$hoodfile" > > > > > > > >
Move the variable definition to the implementation file. This is more intuitive and the variable is not used otherwise. Signed-off-by: Tim Niemeyer <tim@tn-x.org> --- Changes in v2: - move variable from lib/functions/fff/keyxchange src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange | 1 - src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)