Skip to content
Commits on Source (2)
...@@ -184,6 +184,12 @@ public class TapSchemaLoader implements Serializable { ...@@ -184,6 +184,12 @@ public class TapSchemaLoader implements Serializable {
} }
public String openLoaded() { public String openLoaded() {
if (loadedTapSchema == null) {
throw new IllegalStateException("Attempted to access a TAP_SCHEMA not loaded yet. "
+ "This may be caused by an error on frontend or a browser cache issue.");
}
ConsistencyChecks checks = loadedTapSchema.getConsistencyChecks(); ConsistencyChecks checks = loadedTapSchema.getConsistencyChecks();
if (checks != null && (checks.isInconsistent() || checks.isHasWarnings())) { if (checks != null && (checks.isInconsistent() || checks.isHasWarnings())) {
consistencyChecksBean.setTapSchema(loadedTapSchema); consistencyChecksBean.setTapSchema(loadedTapSchema);
......
...@@ -133,6 +133,8 @@ function build_installer_package { ...@@ -133,6 +133,8 @@ function build_installer_package {
rm tasman-webapp.war rm tasman-webapp.war
rm tasman-embedded.jar rm tasman-embedded.jar
cp install_template.sh install.sh cp install_template.sh install.sh
config_dir=$(cat config.properties | grep config_directory | cut -d"=" -f2 | xargs)
sed -i "s/__CONFIG_DIR__/${config_dir//\//\\/}/g" install.sh
cat tasman.tar.gz >> install.sh cat tasman.tar.gz >> install.sh
rm tasman.tar.gz rm tasman.tar.gz
echo "TASMAN install.sh built" echo "TASMAN install.sh built"
......
...@@ -73,10 +73,10 @@ if [[ -z "$ucd_service_url" ]]; then ...@@ -73,10 +73,10 @@ if [[ -z "$ucd_service_url" ]]; then
fi fi
# TASMAN configuration directory # TASMAN configuration directory
echo -e "Specify TASMAN configuration directory [/etc/tasman]: \c" echo -e "Specify TASMAN configuration directory [__CONFIG_DIR__]: \c"
read tasman_config_dir read tasman_config_dir
if [[ -z "$tasman_config_dir" ]]; then if [[ -z "$tasman_config_dir" ]]; then
tasman_config_dir="/etc/tasman" tasman_config_dir="__CONFIG_DIR__"
fi fi
mkdir -p "$tasman_config_dir" mkdir -p "$tasman_config_dir"
if [ ! $? -eq 0 ]; then if [ ! $? -eq 0 ]; then
......