[NF] Now sould dedect Strg+c on Linux

Zway-Bot/Program.cs

@@ -11,6 +11,7 @@ namespace ZwayBot {
     private readonly ZwayController zw;
     private readonly Dictionary<String, AModul> moduls = new Dictionary<String, AModul>();
     private Boolean RunningProcess = true;
+    private System.Threading.Thread sig_thread;
     private readonly ProgramLogger logger = new ProgramLogger();
 
     public Program(String[] args) {
@@ -42,6 +43,16 @@ namespace ZwayBot {
     }
 
     private void WaitForShutdown() {
+      this.sig_thread = new System.Threading.Thread(delegate() {
+        Mono.Unix.UnixSignal[] signals = new Mono.Unix.UnixSignal[] {
+          new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM),
+          new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGINT)
+        };
+        while (true) {
+          Int32 i = Mono.Unix.UnixSignal.WaitAny(signals, -1);
+          this.RunningProcess = false;
+        }
+      });
       Console.CancelKeyPress += new ConsoleCancelEventHandler(this.SetupShutdown);
       while (this.RunningProcess) {
         System.Threading.Thread.Sleep(100);
@@ -59,6 +70,7 @@ namespace ZwayBot {
         Console.WriteLine("Modul entladen: " + item.Key);
       }
       this.zw.Dispose();
+      this.sig_thread.Abort();
     }
 
     private void ModulEvents() {

Zway-Bot/Properties/AssemblyInfo.cs

@@ -31,8 +31,8 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyVersion("1.4.3")]
-[assembly: AssemblyFileVersion("1.4.0")]
+[assembly: AssemblyFileVersion("1.4.3")]
 [assembly: NeutralResourcesLanguage("de-DE")]
 
 // “Internet Of Things” icon by By Michael Wohlwend, US, from thenounproject.com.

Zway-Bot/Zway-Bot.csproj

@@ -12,6 +12,8 @@
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -51,6 +53,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="dpkg\preinst" />
+    <None Include="dpkg\postinst" />
     <Compile Include="Events.cs" />
     <Compile Include="Interfaces\IForceLoad.cs" />
     <Compile Include="Moduls\AModul.cs" />
@@ -150,6 +153,7 @@
     <None Include="dpkg\make-deb.sh" />
     <None Include="dpkg\prerm" />
     <None Include="dpkg\zwaybot.service" />
+    <None Include="packages.config" />
     <None Include="Resources\Icon.ico" />
     <Content Include="Resources\icon.svg" />
   </ItemGroup>
@@ -160,4 +164,11 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Mono.Posix.5.4.0.201\build\net45\Mono.Posix.targets" Condition="Exists('..\packages\Mono.Posix.5.4.0.201\build\net45\Mono.Posix.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Mono.Posix.5.4.0.201\build\net45\Mono.Posix.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Mono.Posix.5.4.0.201\build\net45\Mono.Posix.targets'))" />
+  </Target>
 </Project>

Zway-Bot/bin/Release/config-example/cronjob.conf.example

@@ -1,4 +1,4 @@
-[modul]
+[modul]
 config=public
 
 [cold]

Zway-Bot/bin/Release/config-example/mqtt.conf.example

@@ -1,4 +1,4 @@
-[modul]
+[modul]
 config=private
 
 [settings]

Zway-Bot/bin/Release/config-example/names.conf.example

@@ -1,4 +1,4 @@
-[names]
+[names]
 2-0-37=Kühlschrank Schalter
 2-0-49-4=Kühlschrank Leistung
 2-0-50-0=Kühlschrank Verbrauch [kWh]

Zway-Bot/bin/Release/config-example/overtaker.conf.example

@@ -1,4 +1,4 @@
-[hot]
+[hot]
 from=7-0-67-1:Level
 to=8-0-67-1:Level;9-0-67-1:Level
 

Zway-Bot/bin/Release/config-example/senml.conf.example

@@ -1,4 +1,4 @@
-[modul]
+[modul]
 config=private
 
 [settings]

Zway-Bot/bin/Release/config-example/settings.conf.example

@@ -1,4 +1,4 @@
-[zway]
+[zway]
 server=localhost
 user=admin
 pass=pass

Zway-Bot/bin/Release/config-example/statuspolling.conf.example

@@ -1,3 +1,3 @@
-[temp]
+[temp]
 cron=30 * * * *
 devices=7-0-49-1,8-0-49-1,9-0-49-1,10-0-49-1,11-0-49-1

Zway-Bot/config-example/cronjob.conf.example

@@ -1,4 +1,4 @@
-[modul]
+[modul]
 config=public
 
 [cold]

Zway-Bot/config-example/mqtt.conf.example

@@ -1,4 +1,4 @@
-[modul]
+[modul]
 config=private
 
 [settings]

Zway-Bot/config-example/names.conf.example

@@ -1,4 +1,4 @@
-[names]
+[names]
 2-0-37=Kühlschrank Schalter
 2-0-49-4=Kühlschrank Leistung
 2-0-50-0=Kühlschrank Verbrauch [kWh]

Zway-Bot/config-example/overtaker.conf.example

@@ -1,4 +1,4 @@
-[hot]
+[hot]
 from=7-0-67-1:Level
 to=8-0-67-1:Level;9-0-67-1:Level
 

Zway-Bot/config-example/senml.conf.example

@@ -1,4 +1,4 @@
-[modul]
+[modul]
 config=private
 
 [settings]

Zway-Bot/config-example/settings.conf.example

@@ -1,4 +1,4 @@
-[zway]
+[zway]
 server=localhost
 user=admin
 pass=pass

Zway-Bot/config-example/statuspolling.conf.example

@@ -1,3 +1,3 @@
-[temp]
+[temp]
 cron=30 * * * *
 devices=7-0-49-1,8-0-49-1,9-0-49-1,10-0-49-1,11-0-49-1

Zway-Bot/dpkg/control

@@ -2,7 +2,7 @@ Package: zwaybot
 Version: x.x-x
 Section: base
 Priority: optional
-Architecture: i386
+Architecture: any
 Depends: mono-complete (>= 5.4.1.6)
 Maintainer: BlubbFish <dev@blubbfish.net>
 Description: Zway-Bot

Zway-Bot/dpkg/create-Builds.bat

@@ -2,5 +2,5 @@ set /P maj=Enter Major Version:
 set /P min=Enter Minor Version:
 set /P bui=Enter Build Version:
 
-bash.exe -c "./make-deb.sh %maj% %min% %bui%" 
+bash.exe -c "./make-deb.sh %maj% %min% %bui% armhf" 
 pause

Zway-Bot/dpkg/make-deb.sh

@@ -9,6 +9,7 @@ DEBIAN="$ROOT/DEBIAN"
 VMAJOR=$1
 VMINOR=$2
 VBUILD=$3
+ARCHT=$4
 
 mkdir -p $EXEC
 mkdir -p $CONFIG
@@ -17,8 +18,10 @@ mkdir -p $SYSTEMD
 
 cp control $DEBIAN
 cp preinst $DEBIAN
+cp postinst $DEBIAN
 cp prerm $DEBIAN
 sed -i s/Version:\ x\.x-x/"Version: $VMAJOR.$VMINOR-$VBUILD"/ $DEBIAN/control
+sed -i s/Architecture:\ any/"Architecture: $ARCHT"/ $DEBIAN/control
 chmod 755 $DEBIAN -R
 
 cp zwaybot.service $SYSTEMD
@@ -30,5 +33,5 @@ cp $OUTPUT/config-example/* $CONFIG
 cp $OUTPUT/control $EXEC/ -r
 
 dpkg-deb --build $ROOT
-mv $WORKDIR/deb.deb ../bin/Builds/"zwaybot_$VMAJOR.$VMINOR-$VBUILD.deb"
+mv $WORKDIR/deb.deb ../bin/Builds/$ARCHT/"zwaybot_$VMAJOR.$VMINOR-$VBUILD.deb"
 rm $WORKDIR/deb -r

Zway-Bot/dpkg/postinst

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+service zwaybot start

Zway-Bot/dpkg/preinst

@@ -1,4 +1,5 @@
 #!/bin/sh
 
 service zwaybot stop
-adduser --system zwaybot
+addgroup zwaybot
+adduser --system --no-create-home --disabled-login --ingroup zwaybot zwaybot

Zway-Bot/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Mono.Posix" version="5.4.0.201" targetFramework="net471" />
+</packages>