Additional fixes in nodelist.

gavrilovegor519 · Jan 6, 2025 · a0b895c · a0b895c
1 parent 8340a91
commit a0b895c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/golded/golded.Build b/golded/golded.Build
@@ -122,7 +122,7 @@ cp -a chsgen/* "$PKG"/usr/etc/golded+/
 cp "$CWD"/golded.cfm "$PKG"/usr/etc/golded+/
 mkdir -p "$PKG"/fido
 mkdir -p "$PKG"/fido/nodelist
-cp "$CWD"/nodelist.txt "$PKG"/fido/nodelist/
+cp "$CWD"/nodelist.[0-9][0-9][0-9] "$PKG"/fido/nodelist/
 cp "$CWD"/goldnode.* "$PKG"/fido/nodelist/
 cat "$CWD"/nodelist.sh | sed "s|INSTALLDIR|$HOMEDIR|g" > "$PKG"/usr/bin/nodelist.sh
 chmod +x "$PKG"/usr/bin/nodelist.sh

diff --git a/golded/nodelist.sh b/golded/nodelist.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
+rm INSTALLDIR/fido/nodelist/nodelist.[0-9][0-9][0-9]
 curl -O --output-dir INSTALLDIR/fido/nodelist/ "ftp://wfido.ru/nodehist/$(date +%Y)/nodelist.$(date +%j)"
+chmod 644 INSTALLDIR/fido/nodelist/nodelist.[0-9][0-9][0-9]
 echo 'Updating golded nodelist index.'
 INSTALLDIR/usr/bin/gnlnx -C INSTALLDIR/usr/etc/golded+/golded.cfg
 
diff --git a/node/binkd.cfg.template-node b/node/binkd.cfg.template-node
@@ -41,7 +41,7 @@ brakebox  INSTALLDIR/fido/badarea
 prescan
 
 perl-hooks INSTALLDIR/usr/bin/nodelist.pl
-perl-var nodelist fidonet:INSTALLDIR/fido/nodelist/nodelist.txt
+perl-var nodelist fidonet:INSTALLDIR/fido/nodelist/nodelist.[0-9][0-9][0-9]
 perl-var magichost *
 
 # First and main link

diff --git a/setup_config.bash b/setup_config.bash
@@ -623,7 +623,7 @@ fi
 
 chmod 644 "$HOMEDIR"/fido/*.log
 chmod 644 "$HOMEDIR"/fido/*.hlp
-chmod 644 "$HOMEDIR"/fido/nodelist/nodelist.txt
+chmod 644 "$HOMEDIR"/fido/nodelist/nodelist.[0-9][0-9][0-9]
 chmod 644 "$HOMEDIR"/fido/nodelist/*.g*
 chmod 644 "$HOMEDIR"/usr/etc/*.cfg
 chmod 644 "$HOMEDIR"/usr/etc/*.conf-dist

diff --git a/setup_node.bash b/setup_node.bash
@@ -754,7 +754,7 @@ set +e
 chmod 644 "$HOMEDIR"/fido/*.log
 chmod 644 "$HOMEDIR"/fido/*.txt
 chmod 644 "$HOMEDIR"/fido/*.hlp
-chmod 644 "$HOMEDIR"/fido/nodelist/nodelist.txt
+chmod 644 "$HOMEDIR"/fido/nodelist/nodelist.[0-9][0-9][0-9]
 chmod 644 "$HOMEDIR"/fido/nodelist/*.g*
 chmod 644 "$HOMEDIR"/usr/etc/*.cfg
 chmod 644 "$HOMEDIR"/usr/etc/*.conf-dist