From 7052c3ccf7daff977bca5ef60831c1613f371313 Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Tue, 26 Mar 2019 22:08:57 +0800
Subject: [PATCH] Beauty initThemes

---
 .../ryanc/halo/listener/StartedListener.java  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cc/ryanc/halo/listener/StartedListener.java b/src/main/java/cc/ryanc/halo/listener/StartedListener.java
index 09722679b..e982c1b4c 100644
--- a/src/main/java/cc/ryanc/halo/listener/StartedListener.java
+++ b/src/main/java/cc/ryanc/halo/listener/StartedListener.java
@@ -142,20 +142,23 @@ public class StartedListener implements ApplicationListener<ApplicationStartedEv
      * Init internal themes
      */
     private void initThemes() {
-        // Whether the blog is initialized
-        Boolean isInstall = optionService.getByProperty(BlogProperties.IS_INSTALL, Boolean.class, false);
+        // Whether the blog has initialized
+        Boolean isInstalled = optionService.getByProperty(BlogProperties.IS_INSTALL, Boolean.class, false);
         try {
-            if (!isInstall) {
-                File internalThemePath = new File(ResourceUtils.getURL("classpath:").getPath(), "templates/themes");
-                File[] internalThemes = internalThemePath.listFiles();
-                if (null != internalThemes) {
-                    for (File theme : internalThemes) {
-                        FileUtil.copy(theme, themeService.getThemeBasePath(), true);
-                    }
+            if (isInstalled) {
+                // Skip
+                return;
+            }
+
+            File internalThemePath = new File(ResourceUtils.getURL(ResourceUtils.CLASSPATH_URL_PREFIX).getPath(), "templates/themes");
+            File[] internalThemes = internalThemePath.listFiles();
+            if (null != internalThemes) {
+                for (File theme : internalThemes) {
+                    FileUtil.copy(theme, themeService.getThemeBasePath(), true);
                 }
             }
         } catch (Exception e) {
-            throw new RuntimeException("Init internal theme to user path error");
+            throw new RuntimeException("Init internal theme to user path error", e);
         }
     }
 }