Changeset 251 in Main for trunk

Timestamp:

Oct 4, 2024, 6:15:19 AM (6 weeks ago)

Author:

Nishi

Message:

fix installer.sh

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• installer.sh (modified) (2 diffs)

trunk/Makefile

@@ -35 +35 @@
 
 ./README: ./README.tmpl ./Server/tw_version.h
-        sed "s/@VERSION@/`grep "define TW_VERSION" Server/tw_version.h | grep -Eo '"[^\]+' | sed 's/^"//g'`/g" ./README.tmpl > $@
+        sed "s/@VERSION@/`grep "define TW_VERSION" Server/tw_version.h | grep -Eom 1 '"[^\]+' | sed 's/^"//g'`/g" ./README.tmpl > $@
 
 install: all ./Tool/genconf ./Tool/itworks
@@ -49 +49 @@
 
 get-version:
-        @grep "define TW_VERSION" Server/tw_version.h | grep -Eo '"[^\]+' | sed 's/^"//g'
+        @grep "define TW_VERSION" Server/tw_version.h | grep -Eom 1 '"[^\]+' | sed 's/^"//g'
 
 clean:

trunk/installer.sh

@@ -31 +31 @@
 ../Tool/genconf "C:/Tewi" modules dll > ../generated.conf
 ../Tool/itworks > ../itworks.html
-makensis -DVERSION=$VERSION install.nsi
+makensis -DVERSION=$VERSION install.nsi || fail
 cp install.exe ../install-nossl.exe
 rm -f tewi.exe tewi-service.exe
@@ -47 +47 @@
 ../Tool/genconf "C:/Tewi" modules dll > ../generated.conf
 ../Tool/itworks > ../itworks.html
-makensis -DVERSION=$VERSION install.nsi
+makensis -DVERSION=$VERSION install.nsi || fail
 cp install.exe ../install-ssl.exe
 rm -f tewi.exe tewi-service.exe