From a97a1f029de44bce08ac2484525cb95b92074288 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sat, 22 Aug 2015 17:38:33 +0000
Subject: [PATCH] appearance: fix skins path, installer: update, eolite: use
 tahoma.kf

git-svn-id: svn://kolibrios.org@5765 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/appearance/appearance.c   | 4 +---
 programs/cmm/appearance/compile_en.bat | 3 ++-
 programs/cmm/appearance/compile_ru.bat | 3 ++-
 programs/cmm/eolite/Eolite.c           | 2 +-
 programs/cmm/installer/installer.c     | 6 +++---
 programs/cmm/lib/font.h                | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c
index f076164242..9c39e6e0f1 100644
--- a/programs/cmm/appearance/appearance.c
+++ b/programs/cmm/appearance/appearance.c
@@ -25,9 +25,7 @@
 unsigned char icons[]= FROM "icons.raw";
 
 #define PANEL_H 30
-#define SKINS_STANDART_PATH "/sys/skins"
-							//"/kolibrios/res/skins"
-							
+#define SKINS_STANDART_PATH "/kolibrios/res/skins"							
 #define WALP_STANDART_PATH "/kolibrios/res/wallpapers"
 
 llist list[2];
diff --git a/programs/cmm/appearance/compile_en.bat b/programs/cmm/appearance/compile_en.bat
index 5a34205586..500935dd04 100644
--- a/programs/cmm/appearance/compile_en.bat
+++ b/programs/cmm/appearance/compile_en.bat
@@ -6,4 +6,5 @@ C-- appearance.c
 @rename appearance.com appearance
 @del warning.txt
 @del lang.h--
-@pause
\ No newline at end of file
+@pause
+kpack appearance
\ No newline at end of file
diff --git a/programs/cmm/appearance/compile_ru.bat b/programs/cmm/appearance/compile_ru.bat
index b082f2491b..f4c0adf929 100644
--- a/programs/cmm/appearance/compile_ru.bat
+++ b/programs/cmm/appearance/compile_ru.bat
@@ -6,4 +6,5 @@ C-- appearance.c
 @rename appearance.com appearance
 @del warning.txt
 @del lang.h--
-@pause
\ No newline at end of file
+@pause
+kpack appearance
\ No newline at end of file
diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index 2daec83d08..156f1e1c71 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -129,7 +129,7 @@ void main()
 	strcpy(#inactive_path, #path);
 	llist_copy(#files_inactive, #files);
 	font.no_bg_copy = true;
-	font.load("/sys/font/Tahoma.kf");
+	font.load("/sys/fonts/tahoma.kf");
 	SetEventMask(1100111b);
 	loop(){
 		switch(WaitEvent())
diff --git a/programs/cmm/installer/installer.c b/programs/cmm/installer/installer.c
index a2dc63d24c..6c51fc2ab2 100644
--- a/programs/cmm/installer/installer.c
+++ b/programs/cmm/installer/installer.c
@@ -14,16 +14,16 @@
 void main()
 {
 
-	SetAddApplDir("kolibrios", abspath("kolibrios")+1);
+	SetAddApplDir("kolibrios", abspath("install/kolibrios")+1);
 	io.run("/sys/media/kiv", "\\S__/kolibrios/res/Wallpapers/In the wind there is longing.png");
-	copyf(abspath("sys"), "/sys");
+	copyf(abspath("install/sys"), "/sys");
 	RestartProcessByName("@icon", MULTIPLE);
 	RestartProcessByName("@taskbar", SINGLE);
 	RestartProcessByName("@docky", SINGLE);
 	notify(T_END);
 	io.run("/sys/tmpdisk", "a0s10");
 	pause(50);
-	copyf(abspath("tmp"), "/tmp0/1");
+	copyf(abspath("install/tmp"), "/tmp0/1");
 	ExitProcess();
 }
 
diff --git a/programs/cmm/lib/font.h b/programs/cmm/lib/font.h
index 44c8514dba..b4f0cd210e 100644
--- a/programs/cmm/lib/font.h
+++ b/programs/cmm/lib/font.h
@@ -336,7 +336,7 @@ inline fastcall dword b24(EBX) { return DSDWORD[EBX] << 8; }
 	dword tmp;
 	buffer_size = 0;
 	IF(data)free(data);
-	if (!io.read(path))
+	if (!io.readKPACK(path))
 	{
 		debug("Error while loading font: ");
 		debugln(path);