merge

idaholab · Jun 17, 2021 · aec115a · aec115a
2 parents 0e42f1e + 4f9089a
commit aec115a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -6,8 +6,8 @@
 
 See the [STIG Innovation Sheet](18-179_STIG_Innovation_Sheet.pdf) for an overview.
 
-For installation and usage instructions, see our documentation.
+For installation and usage instructions, see our [documentation](https://stig.readthedocs.io/en/latest/).
 
-The STIX version 2 specification can be found at **<http://docs.oasis-open.org/cti/stix/v2.0/stix-v2.0-part1-stix-core.html>**.
+The STIX version 2.1 specification can be found at **<https://oasis-open.github.io/cti-documentation/resources>**.
 An introduction and walk through of STIX can be found at **<https://oasis-open.github.io/cti-documentation/stix/intro.html>**, and **<https://oasis-open.github.io/cti-documentation/stix/walkthrough.html>**.
 
diff --git a/db_setup/STIG_QUERY_CHEATSHEET.md b/db_setup/STIG_QUERY_CHEATSHEET.md
@@ -1,5 +1,7 @@
 ## Queries to use with STIG
 <!-- These queries only work if there is a database with the information saved inside -->
+Depending on when your database was built, queries that include a dash '-' might work or might not.  
+ie: attack-pattern vs attackpattern.
 
 ### Selecting Malware by Name
 `select from malware where name.toLowerCase() like '%blackcoffee%'`

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -41,8 +41,7 @@
 # ones.
 extensions = [
     "sphinx_rtd_theme",
-    "sphinx.ext.autosectionlabel",
-    "sphinx_tabs.tabs"
+    "sphinx.ext.autosectionlabel"
 ]
 
 # Add any paths that contain templates here, relative to this directory.

diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -5,33 +5,34 @@ STIG requires OrientDB and Java to be installed. Please see the OrientDB/Java in
 
 There are two ways to install STIG. The easiest is to download an executable for your operating system. Head over to the `releases <https://github.com/idaholab/STIG/releases/tag/v2.0.0.alpha>`_ page and install the package for your operating system.
 
+Linux (Deb)
+^^^^^^^^^^^^
 
-.. tabs::
+Run the following command in the terminal.
 
-    .. tab:: Linux (Deb)
+.. code-block:: bash
 
-        Run the following command in the terminal.
-
-        .. code-block:: bash
+    sudo apt install ./stig_2.0.0_amd64.deb 
 
-            sudo apt install ./stig_2.0.0_amd64.deb 
+Linux (RPM)
+^^^^^^^^^^^^
 
-    .. tab:: Linux (RPM)
+Run the following command in the terminal.
 
-        Run the following command in the terminal.
+.. code-block:: bash
 
-        .. code-block:: bash
+    sudo dnf install ./stig_2.0.0_x86_64.rpm 
 
-            sudo dnf install ./stig_2.0.0_x86_64.rpm 
+After the install, enter ``STIG`` in a terminal and press ENTER.
 
-        After the install, enter ``STIG`` in a terminal and press ENTER.
+Windows
+^^^^^^^^^
 
-    .. tab:: Windows
+Double-click on stig.exe 
 
-        Double-click on stig.exe 
+Macos
+^^^^^^^
 
-    .. tab:: Macos
+Double-click on STIG.app, then drag it to the Applications folder.
 
-        Double-click on STIG.app, then drag it to the Applications folder.
-
-The other option is :ref:`Building from Source`.
+The other option is :ref:`Building from Source`.
diff --git a/src/storage/database-configuration-storage.ts b/src/storage/database-configuration-storage.ts
@@ -36,7 +36,7 @@ export class DatabaseConfigurationStorage {
     private store: ElectronStore<IDatabaseConfigurationStorageStructure>;
     private constructor() {
         this.store = new ElectronStore<IDatabaseConfigurationStorageStructure>({ name: "stig/db_config" });
-        if (!this.store.has("configs")) {
+        if (!this.store.has("configs") || (Object.keys(this.store.get("configs")).length === 0)) {
             this.create_default();
         }
     }