diff --git a/src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java b/src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java index f1f4375..37d86d0 100644 --- a/src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java +++ b/src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java @@ -16,6 +16,7 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; @@ -428,9 +429,12 @@ //アイコンを変更する try { String currentDirectory = System.getProperty("user.dir"); - File root = new File(currentDirectory); - File tomcatFolder = new File(root,"apache-tomcat-9.0.10"); - File webappsFolder = new File(tomcatFolder,"webapps"); + java.nio.file.Path root = Paths.get(currentDirectory); + //binFolder内のstartup.shから起動した場合、起動ディレクトリがbinになるので、親ディレクトリに戻る + if(root.endsWith("bin")){ + root = root.getParent(); + } + File webappsFolder = new File(root.toFile(),"webapps"); File dataFolder = new File(webappsFolder,"tampopo-data"); pathDirectory = dataFolder.getAbsolutePath(); System.out.println(pathDirectory);