Merge branch 'master' into dev

LICENCE

@@ -0,0 +1,26 @@
+Copyright (C) 2012, 2013 Maya Bonkowski
+Copyright (C) 2013 Raphaël Vinot
+Copyright (C) 2013 CIRCL - Computer Incident Response Center Luxembourg (℅ smile gie)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the organization nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -34,10 +34,15 @@ Usage
 0. Power off the device
 1. Plug the untrusted key in the top usb slot of the Raspberry Pi
 2. Plug your own key in the bottom usb slot
-   Note: This key should be bigger than the original one because the archives
+    
+    *Note*: This key should be bigger than the original one because the archives
           will be copyed
+
 3. Optional: connect the HDMI cable to a screen to see what happen
 4. Connect the power to the micro USB
+
+    *Note*: 5V, 700mA regulated power supply
+
 5. Wait until you do not see any blinking green light on the board, or if you
    connected the HDMI cable, check the screen
    it's slow and can take 30-60 minutes depending on how many document

fs/opt/groomer/functions.sh

@@ -86,7 +86,7 @@ application(){
             ;;
         x-dosexec)
             echo "Win executable"
-            copy ${src_file} DANGEROUS_${dst_file}_DANGEROUS
+            copy ${src_file} ${2}/DANGEROUS_${1##$CURRENT_SRC/}_DANGEROUS
             ;;
         zip|x-rar|x-bzip2|x-lzip|x-lzma|x-lzop|x-xz|x-compress|x-gzip|x-tar|*compressed)
             echo "Compressed file"