Fix scripts.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

ChangeLog

@@ -1,3 +1,9 @@
+2021-06-10  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* tool/stlinkv2.py: Switch to Python3.
+
+	* tool/upgrade_by_passwd.py: Fix option handling.
+
 2021-04-30  NIIBE Yutaka  <gniibe@fsij.org>
 
 	* src/openpgp-do.c (rw_algorithm_attr): Fix writing algorithm

tool/stlinkv2.py

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python3
 
 """
 stlinkv2.py - a tool to control ST-Link/V2

tool/upgrade_by_passwd.py

@@ -131,19 +131,25 @@ if __name__ == '__main__':
     skip_check = False
     while len(sys.argv) > 1:
         option = sys.argv[1]
-        sys.argv.pop(1)
         if option == '-f':      # F for Factory setting
+            sys.argv.pop(1)
             passwd = DEFAULT_PW3
         elif option == '-e':    # E for Enumeration
+            sys.argv.pop(1)
             wait_e = int(sys.argv[1])
             sys.argv.pop(1)
         elif option == '-k':    # K for Key number
+            sys.argv.pop(1)
             keyno = int(sys.argv[1])
             sys.argv.pop(1)
         elif option == '-s':    # S for skip the check of target
+            sys.argv.pop(1)
             skip_check = True
         else:
-            raise ValueError("unknown option", option)
+            if option[0] == '-':
+                raise ValueError("unknown option", option)
+            else:
+                break
     if not passwd:
         passwd = getpass("Admin password: ")
     if len(sys.argv) > 1: