run download and import even as Non-Admin
authorOliver Maurhart <oliver.maurhart@ait.ac.at>
Fri, 25 Apr 2014 13:23:20 +0200
changeset 1336649faffb63c
parent 132 8d862576f799
child 134 f1c1c06c947d
run download and import even as Non-Admin
OpenSecurity/bin/download_initial_image.sh
OpenSecurity/bin/initial_vm.sh
OpenSecurity/bin/vmmanager.pyw
     1.1 --- a/OpenSecurity/bin/download_initial_image.sh	Fri Apr 25 13:05:49 2014 +0200
     1.2 +++ b/OpenSecurity/bin/download_initial_image.sh	Fri Apr 25 13:23:20 2014 +0200
     1.3 @@ -24,9 +24,8 @@
     1.4  # that is "Run as Administrator" invocation
     1.5  id -G | grep 544 &> /dev/null
     1.6  if [ "${?}" != 0 ]; then
     1.7 -    echo "Insufficient privileges."
     1.8 -    echo "Is this script executed with 'Run As Administrator'?"
     1.9 -    exit 1
    1.10 +    echo "Insufficient privileges. Is this script executed with 'Run As Administrator'?"
    1.11 +    echo "I'll try anyway..."
    1.12  fi
    1.13  
    1.14  TARGET_FOLDER="${1}"
     2.1 --- a/OpenSecurity/bin/initial_vm.sh	Fri Apr 25 13:05:49 2014 +0200
     2.2 +++ b/OpenSecurity/bin/initial_vm.sh	Fri Apr 25 13:23:20 2014 +0200
     2.3 @@ -43,10 +43,8 @@
     2.4  echo 'checking privileges...'
     2.5  id -G | grep 544 &> /dev/null
     2.6  if [ "${?}" != 0 ]; then
     2.7 -    echo "Insufficient privileges."
     2.8 -    echo "Is this script executed with 'Run As Administrator'?"
     2.9 -    exit 1
    2.10 -echo 'privileges sufficient.'
    2.11 +    echo "Insufficient privileges. Is this script executed with 'Run As Administrator'?"
    2.12 +    echo "I'll try anyway..."
    2.13  fi
    2.14  
    2.15  # check OpenSecurity Initial VM Image
     3.1 --- a/OpenSecurity/bin/vmmanager.pyw	Fri Apr 25 13:05:49 2014 +0200
     3.2 +++ b/OpenSecurity/bin/vmmanager.pyw	Fri Apr 25 13:23:20 2014 +0200
     3.3 @@ -66,10 +66,10 @@
     3.4      def __init__(self):
     3.5  
     3.6          self.systemProperties = self.getSystemProperties()
     3.7 +        self.machineFolder = self.systemProperties["Default machine folder"]
     3.8  
     3.9          # only proceed if we have a working background environment
    3.10          if self.backend_ok():
    3.11 -            self.machineFolder = self.systemProperties["Default machine folder"]
    3.12              self.cleanup()
    3.13              self.rsdHandler = DeviceHandler(self)
    3.14              self.rsdHandler.start()