fb7390 fixes/tests

git-svn-id: https://svn.fhem.de/fhem/trunk@1182 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/CHANGED

@@ -1,5 +1,6 @@
 - SVN
   - feature: internal NotifyOrderPrefix: 98_average.pm is more straightforward
+  - feature: the usb command tries to flash unflashed CULs on linux
 
 
 - 2011-12-31 (5.2)

fhem/FHEM/98_autocreate.pm

@@ -343,12 +343,13 @@ CommandUsb($$)
     $culType = "CUL_V4" if($lsusb =~ m/03eb:2ff0/);
     $culType = "CUL_V3" if($lsusb =~ m/03eb:2ff4/);
     $culType = "CUL_V2" if($lsusb =~ m/03eb:2ffa/);
-    last if(!$culType);
-    $msg = "$culType: flash it with: CULflash none $culType";
-    Log 4, $msg; $ret .= $msg . "\n";
-    if(!$scan) {
-      CommandCULflash(undef, "none $culType");
-      sleep(4);      # Leave time for linux to load th drivers
+    if($culType) {
+      $msg = "$culType: flash it with: CULflash none $culType";
+      Log 4, $msg; $ret .= $msg . "\n";
+      if(!$scan) {
+        CommandCULflash(undef, "none $culType");
+        sleep(4);      # Leave time for linux to load th drivers
+      }
     }
   }
 
@@ -407,7 +408,10 @@ CommandUsb($$)
           $msg = "$dev: create as a fhem device with: define $define";
           Log 4, $msg; $ret .= $msg . "\n";
 
-          CommandDefine($cl, $define) if($scan);
+          if(!$scan) {
+            Log 1, "define $define";
+            CommandDefine($cl, $define);
+          }
 
           goto NEXTDEVICE;
         }

fhem/contrib/FB7390/install

@@ -57,9 +57,7 @@ if test $r != 0; then
 fi
 rm -f /var/nvi.tmp
 
-echo "########################### Starting fhem ############################"
-sync
-$home/startfhem
-
+# We have to restart with exit code 1, else the frontend tells us:
+# update failed: no error
 echo "########################### FHEM INSTALL END #########################"
-exit 1 # INSTALL_SUCCESS_REBOOT
+exit 1

fhem/contrib/FB7390/startfhem

@@ -28,7 +28,7 @@ if [ "$?" -ne "0" ]; then
   chown -R boxusr80 ${home}/FHEM
 
   chown root ${home}/dfu-programmer
-  chmod 2755 ${home}/dfu-programmer
+  chmod 4755 ${home}/dfu-programmer
 fi 
 
 perl fhem.pl fhem.cfg