run dbtool once .war is deflated

install.sh

@@ -249,6 +249,7 @@ export TAG
 #sudo -u ctsms /ctsms/dbtool.sh -sn
 chmod +rwx /ctsms/install/init_database.sh
 /ctsms/install/init_database.sh
+/ctsms/clearcache.sh
 
 ###setup cron
 chmod +rwx /ctsms/install/install_cron.sh

upgrade.sh

@@ -80,10 +80,6 @@ rm /var/lib/tomcat9/webapps/ROOT/ -rf
 cp /ctsms/build/ctsms/web/target/ctsms-$VERSION.war /var/lib/tomcat9/webapps/ROOT.war
 systemctl start tomcat9
 
-###update permissions and criterions
-sudo -u ctsms /ctsms/dbtool.sh -icp /ctsms/master_data/criterion_property_definitions.csv
-sudo -u ctsms /ctsms/dbtool.sh -ipd /ctsms/master_data/permission_definitions.csv
-
 ###update bulk-processor
 wget --no-check-certificate --content-disposition https://github.com/phoenixctms/bulk-processor/archive/$TAG.tar.gz -O /ctsms/bulk-processor.tar.gz
 tar -zxvf /ctsms/bulk-processor.tar.gz -C /ctsms/bulk_processor --strip-components 1
@@ -103,6 +99,11 @@ wget https://raw.githubusercontent.com/phoenixctms/install-debian/$TAG/inquiryda
 chown ctsms:ctsms /ctsms/inquirydataexport.sh
 chmod 755 /ctsms/inquirydataexport.sh
 
+###update permissions and criterions
+sudo -u ctsms /ctsms/dbtool.sh -icp /ctsms/master_data/criterion_property_definitions.csv
+sudo -u ctsms /ctsms/dbtool.sh -ipd /ctsms/master_data/permission_definitions.csv
+/ctsms/clearcache.sh
+
 ###render workflow state diagram images from db and include them for tooltips
 cd /ctsms/bulk_processor/CTSMS/BulkProcessor/Projects/Render
 ./render.sh