diff --git a/archive/create_archive.sh b/archive/create_archive.sh index 7094ea2..75b8724 100755 --- a/archive/create_archive.sh +++ b/archive/create_archive.sh @@ -34,7 +34,7 @@ cp archive/infinitypfm.sh infinitypfm.archive/bin; chmod a+x infinitypfm.archive/bin; #cp infinitypfm-ui/infinitypfm.desktop infinitypfm.archive/; #cp infinitypfm-ui/infinitypfm.xpm infinitypfm.archive/; -cp *.jar infinitypfm.archive/lib/; +cp target/*.jar infinitypfm.archive/lib/; cp -L /usr/share/java/swt.jar infinitypfm.archive/lib/; cp -L $WIN_SWT_LOCAL/swt.jar infinitypfm.archive/lib/swt_win.jar; cp -L /usr/share/java/ibatis.jar infinitypfm.archive/lib/; @@ -60,8 +60,8 @@ cp -L /usr/lib/jni/libswt-pi-gtk-3836.so infinitypfm.archive/lib/; cp -L /usr/lib/jni/libswt-webkit-gtk-3836.so infinitypfm.archive/lib/; cp -L /usr/share/java/mailapi.jar infinitypfm.archive/lib/; cp -L /usr/share/java/commons-csv.jar infinitypfm.archive/lib/; -cp -L /usr/share/java/freemarker.jar infinitypfm.archive/usr/lib/; -cp -L /usr/share/java/log4j-1.2.jar infinitypfm.archive/usr/lib/; +cp -L /usr/share/java/freemarker.jar infinitypfm.archive/lib/; +cp -L /usr/share/java/log4j-1.2.jar infinitypfm.archive/lib/; #cp -L -R /usr/lib/jvm/java-1.8.0-openjdk-amd64 infinitypfm.archive/lib/; #cp infinitypfm.run infinitypfm.archive/usr/bin/infinitypfm diff --git a/infinitypfm-ui/src/main/java/org/infinitypfm/client/InfinityPfm.java b/infinitypfm-ui/src/main/java/org/infinitypfm/client/InfinityPfm.java index 2189334..fc15221 100644 --- a/infinitypfm-ui/src/main/java/org/infinitypfm/client/InfinityPfm.java +++ b/infinitypfm-ui/src/main/java/org/infinitypfm/client/InfinityPfm.java @@ -217,6 +217,8 @@ private static void initConfig() throws ConfigurationException{ if (!canContinue) throw new ConfigurationException(CONFIG_ERROR_ENG + homeDirectory.getPath()); + + extractFile(MM.PROPS_FILE, "", homeDirectory.getPath()); /*TODO: may not need this