Prüfung von httping auf curl umgestellt

Globals/Globals.qml

@@ -2,7 +2,7 @@ pragma Singleton
 import QtQuick 2.0
 
 Item {
-    property string versionINFO: "S0-V001"
+    property string versionINFO: "S0-V002"
 //    property color customer_color_base: "#FF00ADEF" // Basisfarbe Kundenabhängig
     property color customer_color_base: "#FF559F98" // Basisfarbe Kundenabhängig
     property string baseDir: "/opt/GfA-Browser"

HMI_UpdatePopup.qml

@@ -163,7 +163,7 @@ Item {
             visible: clickedINDEX >= 0 ? true:false
             onButtPressed: {
                 //popupVISIBLE = false;
-                var appname = "/opt/di-soric/Scripts/UpdateAndReboot.sh ";
+                var appname = Globals.baseDir + "/Scripts/UpdateAndReboot.sh "
                 appname += selectedFileName + " ";
                 appname += (sysinfo.currentCpuArchitecture == "x86_64")?"/home/ru/IFACE/update":"/";
                 appname += " " + sysinfo.currentCpuArchitecture;

Start.qml

@@ -69,7 +69,7 @@ Rectangle {
         running: false
         repeat: false
         onTriggered: {
-            testWebsite.appName = "httping -c1 -s -q -G " + camURL;
+            testWebsite.appName = "curl -m 1 -Is " + camURL;
             if(menuAREA.z === 1) {
                 testWebsite.launchScript();
             } else {
@@ -121,7 +121,8 @@ Rectangle {
         urlchangeBUSY.visible = true;
         camURL = whichCamSet();
 
-        testWebsite.appName = "httping -c1 -s -q -G " + camURL;
+        testWebsite.appName = "curl -m 1 -Is " + camURL;
+
         testWebsite.launchScript();
         console.debug("CAMURL Component.onCompleted :" + camURL);
     }
@@ -133,7 +134,8 @@ Rectangle {
                 console.debug("CAMURL onVisible changed :" + camURL);
                 camURL = whichCamSet();
 
-                testWebsite.appName = "httping -c1 -s -q -G " + camURL;
+                testWebsite.appName = "curl -m 1 -Is " + camURL;
+
                 testWebsite.launchScript();
                 console.debug("CAMURL onVisibleChanged :" + camURL);
             }
@@ -273,7 +275,8 @@ Rectangle {
                         onPressAndHold: {
                             camURL = whichCamSet();
 
-                            testWebsite.appName = "httping -c1 -s -q -G " + camURL;
+                            testWebsite.appName = "curl -m 1 -Is " + camURL;
+
                             testWebsite.launchScript();
 
                             sysinfo.beep();

resources.qrc

@@ -5,7 +5,6 @@
         <file>images/Icon Home 24x24 Rev003.png</file>
         <file>images/Icon Lock 24x24 Rev003.png</file>
         <file>images/Icon Undo 24x24 Rev003.png</file>
-        <file>images/di-soric-logo.png</file>
         <file>images/HmiSettings.svg</file>
         <file>HMI_MainMenu.qml</file>
         <file>images/AdminSettings.svg</file>
@@ -17,7 +16,6 @@
         <file>images/UndoButton.svg</file>
         <file>images/LockButton.svg</file>
         <file>Menu/Background.qml</file>
-        <file>images/di-soric.svg</file>
         <file>Menu/MenuStatus.qml</file>
         <file>HMI_Settings.qml</file>
         <file>CAM_SettingsContainer.qml</file>