Adds reset flag to Empire (#145)

* Added reset flag to empire

* Changes reset flag to avoid mistyping when using --rest

* Removed starting empire from reset script

empire

@@ -1446,6 +1446,7 @@ if __name__ == '__main__':
 
     generalGroup = parser.add_argument_group('General Options')
     generalGroup.add_argument('--debug', nargs='?', const='1', help='Debug level for output (default of 1, 2 for msg display).')
+    generalGroup.add_argument('--reset-empire', action='store_true', help="Resets Empire's database to defaults.")
     generalGroup.add_argument('-v', '--version', action='store_true', help='Display current Empire version.')
     generalGroup.add_argument('-r','--resource', nargs=1, help='Run the Empire commands in the specified resource file after startup.')
 
@@ -1473,6 +1474,9 @@ if __name__ == '__main__':
     if args.version:
         print(empire.VERSION)
 
+    if args.reset_empire:
+        subprocess.call("./setup/reset.sh")
+
     elif args.rest:
          # start an Empire instance and RESTful API
         main = empire.MainMenu(args=args)

setup/reset.sh

@@ -32,10 +32,3 @@ if [ -d ./downloads/ ]
 then
 	rm -rf ./downloads/
 fi
-
-# start up Empire if not in docker otherwise return
-if [ -f /.dockerenv ]; then
-    echo " [*] Empire reset complete returning back to Docker"
-else
-    ./empire
-fi