2020-04-26 20:08:27

This commit is contained in:
christiansacks 2020-04-26 20:08:29 +01:00
parent c4f42f458f
commit 83041524a3
2 changed files with 55 additions and 5 deletions

View File

@ -11,13 +11,15 @@ COMMIT="$(date "+%Y-%m-%d %H:%M:%S")"
cd $WORKDIR cd $WORKDIR
git pull git pull
makenl -d nodelist.txt echo "Compiling nodelist..."
makenl -d nodelist.txt >/dev/null
absfile=$(ls -rt outfile/* | tail -1) absfile=$(ls -rt outfile/* | tail -1)
file=$(echo $(basename $absfile)) file=$(echo $(basename $absfile))
ext=$(echo $file | awk -F. '{ print $2 }') ext=$(echo $file | awk -F. '{ print $2 }')
newext="z${ext:1:2}" newext="z${ext:1:2}"
echo "Creating zip archive tqwnet.$newext..."
zip -j9 zip/tqwnet.$newext $absfile zip -j9 zip/tqwnet.$newext $absfile
git add . -A git add . -A
@ -25,11 +27,16 @@ git commit -m "$COMMIT"
git push git push
cd $PACKDIR cd $PACKDIR
echo "Now in $PACKDIR directory..."
rm tqwnet.z* rm $PACKDIR/tqwnet.z*
rm tqwinfo.zip rm $PACKDIR/tqwinfo.zip
cp $WORKDIR/zip/tqwnet.$newext .
zip -9 tqwinfo.zip * echo "Copy $WORKDIR/zip/tqwnet.$newext $PACKDIR/"
cp $WORKDIR/zip/tqwnet.$newext $PACKDIR/
echo "Creating zip archive $PACKDIR/tqwinfo.zip..."
zip -j9 $PACKDIR/tqwinfo.zip $PACKDIR/*
git add . -A git add . -A
git commit -m "$COMMIT" git commit -m "$COMMIT"

View File

@ -2977,3 +2977,46 @@ d 26-Apr-2020 19:48:25 makenl[18243] myfnmerge: drive='' dir='/root/git/tqwnet_n
d 26-Apr-2020 19:48:25 makenl[18243] /home/christian/git/personal/makenl-code/src/fileutil.c: cleanit(): cleanup no d 26-Apr-2020 19:48:25 makenl[18243] /home/christian/git/personal/makenl-code/src/fileutil.c: cleanit(): cleanup no
+ 26-Apr-2020 19:48:25 makenl[18243] CRC = 15077 + 26-Apr-2020 19:48:25 makenl[18243] CRC = 15077
+ 26-Apr-2020 19:48:25 makenl[18243] MakeNL finished (rc=0) + 26-Apr-2020 19:48:25 makenl[18243] MakeNL finished (rc=0)
- 26-Apr-2020 20:08:28 makenl[27718] MakeNL 3.5.1 (Linux) compiled with GNU C on Aug 28 2019 10:23:50
+ 26-Apr-2020 20:08:28 makenl[27718] MakeNL started
d 26-Apr-2020 20:08:28 makenl[27718] /home/christian/git/personal/makenl-code/src/os.c: os_fulldir(): called with src='.'
d 26-Apr-2020 20:08:28 makenl[27718] /home/christian/git/personal/makenl-code/src/os.c: os_fulldir(): after removing slash: '.'
d 26-Apr-2020 20:08:28 makenl[27718] os_fullpath(): dir='', name='', ext=''
d 26-Apr-2020 20:08:28 makenl[27718] os_fullpath(): old directory='/root/git/tqwnet_nodelist'
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='(null)' dir='/root/git/tqwnet_nodelist' name='' ext=''
d 26-Apr-2020 20:08:28 makenl[27718] os_fullpath(): complete filename: '/root/git/tqwnet_nodelist/'
d 26-Apr-2020 20:08:28 makenl[27718] /home/christian/git/personal/makenl-code/src/os.c: os_fulldir(): absolute path '/root/git/tqwnet_nodelist/'
d 26-Apr-2020 20:08:28 makenl[27718] /home/christian/git/personal/makenl-code/src/os.c: os_fulldir(): st_mode is now 40755
d 26-Apr-2020 20:08:28 makenl[27718] /home/christian/git/personal/makenl-code/src/os.c: os_fulldir(): called with src='./outfile'
d 26-Apr-2020 20:08:28 makenl[27718] /home/christian/git/personal/makenl-code/src/os.c: os_fulldir(): after removing slash: './outfile'
d 26-Apr-2020 20:08:28 makenl[27718] os_fullpath(): dir='.', name='outfile', ext=''
d 26-Apr-2020 20:08:28 makenl[27718] os_fullpath(): old directory='/root/git/tqwnet_nodelist'
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='(null)' dir='/root/git/tqwnet_nodelist' name='outfile' ext=''
d 26-Apr-2020 20:08:28 makenl[27718] os_fullpath(): complete filename: '/root/git/tqwnet_nodelist/outfile'
d 26-Apr-2020 20:08:28 makenl[27718] /home/christian/git/personal/makenl-code/src/os.c: os_fulldir(): absolute path '/root/git/tqwnet_nodelist/outfile'
d 26-Apr-2020 20:08:28 makenl[27718] /home/christian/git/personal/makenl-code/src/os.c: os_fulldir(): st_mode is now 40755
? 26-Apr-2020 20:08:28 makenl[27718] WARNING -- No net NAME given for list header (use /N or NAME verb)
+ 26-Apr-2020 20:08:28 makenl[27718] Cmdline: makenl "-D" "nodelist.txt"
+ 26-Apr-2020 20:08:28 makenl[27718] Using 'nodelist.txt' in '/root/git/tqwnet_nodelist'
+ 26-Apr-2020 20:08:28 makenl[27718] Begin processing 'tqwnet.' -- 20:08, Sunday, April 26, 2020
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='(null)' dir='/root/git/tqwnet_nodelist/outfile' name='tqwnet.' ext='(null)'
d 26-Apr-2020 20:08:28 makenl[27718] main(): shouldprocess /root/git/tqwnet_nodelist/outfile/tqwnet.
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='' dir='/root/git/tqwnet_nodelist/outfile' name='tqwnet' ext='$$$'
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='(null)' dir='/root/git/tqwnet_nodelist/' name='cpyright.txt' ext='(null)'
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='(null)' dir='/root/git/tqwnet_nodelist/' name='prolog.txt' ext='(null)'
d 26-Apr-2020 20:08:28 makenl[27718] CloseMSGFile: status=0
d 26-Apr-2020 20:08:28 makenl[27718] CloseMSGFile: MSGnum=0
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='(null)' dir='/root/git/tqwnet_nodelist/' name='epilog.txt' ext='(null)'
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='(null)' dir='/root/git/tqwnet_nodelist/outfile' name='tqwnet.' ext='122'
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='' dir='/root/git/tqwnet_nodelist/outfile' name='tqwnet' ext='$$$'
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='' dir='/root/git/tqwnet_nodelist/outfile' name='tqwnet' ext='115'
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='' dir='/root/git/tqwnet_nodelist/outfile' name='tqwnet' ext='108'
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='' dir='/root/git/tqwnet_nodelist/outfile' name='tqwnet' ext='101'
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='' dir='/root/git/tqwnet_nodelist/outfile' name='tqwnet' ext='094'
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='' dir='/root/git/tqwnet_nodelist/outfile' name='tqwnet' ext='087'
d 26-Apr-2020 20:08:28 makenl[27718] myfnmerge: drive='' dir='/root/git/tqwnet_nodelist/outfile' name='tqwnet' ext='080'
+ 26-Apr-2020 20:08:28 makenl[27718] Unchanged output file will NOT be submitted
d 26-Apr-2020 20:08:28 makenl[27718] /home/christian/git/personal/makenl-code/src/fileutil.c: cleanit(): cleanup no
+ 26-Apr-2020 20:08:28 makenl[27718] CRC = 15077
+ 26-Apr-2020 20:08:28 makenl[27718] MakeNL finished (rc=0)