From 4222074e8aad9e75146749bb3d3fde55406d077c Mon Sep 17 00:00:00 2001
From: Ryan Emerle <Ryan_Emerle@comcast.com>
Date: Wed, 18 May 2022 08:58:08 -0400
Subject: [PATCH] Minor updates

- Remove executable permissions from *.scala files
- Update `prepare-portal.sh` to avoid creating `package-lock.json` as it
can cause more problems than it prevents
---
 .gitignore                                                      | 1 +
 .../scala/vinyldns/api/repository/ApiDataAccessorProvider.scala | 0
 .../src/main/scala/vinyldns/core/repository/DataAccessor.scala  | 0
 .../src/main/scala/vinyldns/core/repository/DataStore.scala     | 0
 .../main/scala/vinyldns/core/repository/DataStoreConfig.scala   | 0
 .../main/scala/vinyldns/core/repository/DataStoreLoader.scala   | 0
 .../main/scala/vinyldns/core/repository/DataStoreProvider.scala | 0
 .../scala/vinyldns/core/repository/DataStoreStartupError.scala  | 0
 .../src/main/scala/vinyldns/core/repository/Repository.scala    | 0
 modules/portal/prepare-portal.sh                                | 2 +-
 quickstart/.env                                                 | 0
 test/api/integration/.env.integration                           | 0
 12 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 modules/api/src/main/scala/vinyldns/api/repository/ApiDataAccessorProvider.scala
 mode change 100755 => 100644 modules/core/src/main/scala/vinyldns/core/repository/DataAccessor.scala
 mode change 100755 => 100644 modules/core/src/main/scala/vinyldns/core/repository/DataStore.scala
 mode change 100755 => 100644 modules/core/src/main/scala/vinyldns/core/repository/DataStoreConfig.scala
 mode change 100755 => 100644 modules/core/src/main/scala/vinyldns/core/repository/DataStoreLoader.scala
 mode change 100755 => 100644 modules/core/src/main/scala/vinyldns/core/repository/DataStoreProvider.scala
 mode change 100755 => 100644 modules/core/src/main/scala/vinyldns/core/repository/DataStoreStartupError.scala
 mode change 100755 => 100644 modules/core/src/main/scala/vinyldns/core/repository/Repository.scala
 mode change 100755 => 100644 quickstart/.env
 mode change 100755 => 100644 test/api/integration/.env.integration

diff --git a/.gitignore b/.gitignore
index 4ed2231c7..2dafeb677 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ modules/portal/public/javascripts/
 modules/portal/public/project/
 modules/portal/public/stylesheets/
 **/.env.*
+modules/portal/package-lock.json
diff --git a/modules/api/src/main/scala/vinyldns/api/repository/ApiDataAccessorProvider.scala b/modules/api/src/main/scala/vinyldns/api/repository/ApiDataAccessorProvider.scala
old mode 100755
new mode 100644
diff --git a/modules/core/src/main/scala/vinyldns/core/repository/DataAccessor.scala b/modules/core/src/main/scala/vinyldns/core/repository/DataAccessor.scala
old mode 100755
new mode 100644
diff --git a/modules/core/src/main/scala/vinyldns/core/repository/DataStore.scala b/modules/core/src/main/scala/vinyldns/core/repository/DataStore.scala
old mode 100755
new mode 100644
diff --git a/modules/core/src/main/scala/vinyldns/core/repository/DataStoreConfig.scala b/modules/core/src/main/scala/vinyldns/core/repository/DataStoreConfig.scala
old mode 100755
new mode 100644
diff --git a/modules/core/src/main/scala/vinyldns/core/repository/DataStoreLoader.scala b/modules/core/src/main/scala/vinyldns/core/repository/DataStoreLoader.scala
old mode 100755
new mode 100644
diff --git a/modules/core/src/main/scala/vinyldns/core/repository/DataStoreProvider.scala b/modules/core/src/main/scala/vinyldns/core/repository/DataStoreProvider.scala
old mode 100755
new mode 100644
diff --git a/modules/core/src/main/scala/vinyldns/core/repository/DataStoreStartupError.scala b/modules/core/src/main/scala/vinyldns/core/repository/DataStoreStartupError.scala
old mode 100755
new mode 100644
diff --git a/modules/core/src/main/scala/vinyldns/core/repository/Repository.scala b/modules/core/src/main/scala/vinyldns/core/repository/Repository.scala
old mode 100755
new mode 100644
diff --git a/modules/portal/prepare-portal.sh b/modules/portal/prepare-portal.sh
index 316dfcddd..8a8e78abd 100755
--- a/modules/portal/prepare-portal.sh
+++ b/modules/portal/prepare-portal.sh
@@ -4,7 +4,7 @@ DIR=$( cd "$(dirname "$0")" ; pwd -P )
 
 cd "${DIR}"
 
-npm install -f --no-audit --no-fund
+npm install -f --no-audit --no-fund --no-package-lock
 npm install grunt -g -f
 
 grunt default
diff --git a/quickstart/.env b/quickstart/.env
old mode 100755
new mode 100644
diff --git a/test/api/integration/.env.integration b/test/api/integration/.env.integration
old mode 100755
new mode 100644