From bccccba794975f5526e53821ed36ae1479810fe2 Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Wed, 3 Oct 2012 03:02:41 +0200
Subject: [PATCH] Reimplement kpdf.sh changes from PR#348 after the PR#352
 merge, and fix customupdate to actually bundle kpdf.sh in the new location

Conflicts:

	launchpad/kpdf.sh
---
 Makefile          |  2 +-
 kpdf.sh           |  4 ----
 launchpad/kpdf.sh | 33 ---------------------------------
 3 files changed, 1 insertion(+), 38 deletions(-)
 mode change 100644 => 100755 kpdf.sh
 delete mode 100755 launchpad/kpdf.sh

diff --git a/Makefile b/Makefile
index 8ff90e8f9..3e27d4cc4 100644
--- a/Makefile
+++ b/Makefile
@@ -251,7 +251,7 @@ customupdate: all
 	rm -rf $(INSTALL_DIR)
 	mkdir -p $(INSTALL_DIR)/{history,screenshots}
 	echo $(VERSION) > $(INSTALL_DIR)/git-rev
-	cp -p README.md COPYING kpdfview $(LUA_FILES) $(INSTALL_DIR)
+	cp -p README.md COPYING kpdfview kpdf.sh $(LUA_FILES) $(INSTALL_DIR)
 	mkdir $(INSTALL_DIR)/data
 	cp -rpL data/*.css $(INSTALL_DIR)/data
 	cp -rpL fonts $(INSTALL_DIR)
diff --git a/kpdf.sh b/kpdf.sh
old mode 100644
new mode 100755
index c1f81c700..3f5cffc43
--- a/kpdf.sh
+++ b/kpdf.sh
@@ -31,7 +31,3 @@ fi
 
 # always try to continue cvm
 killall -cont cvm || /etc/init.d/framework start
-
-# cleanup hanging process
-killall lipc-wait-event
-
diff --git a/launchpad/kpdf.sh b/launchpad/kpdf.sh
deleted file mode 100755
index b82412e0f..000000000
--- a/launchpad/kpdf.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-export LC_ALL="en_US.UTF-8"
-
-echo unlock > /proc/keypad
-echo unlock > /proc/fiveway
-
-# we're always starting from our working directory
-cd /mnt/us/kindlepdfviewer/
-
-# bind-mount system fonts
-if ! grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then
-	mount -o bind /usr/java/lib/fonts /mnt/us/kindlepdfviewer/fonts/host
-fi
-
-# check if we are supposed to shut down the Amazon framework
-if test "$1" == "--framework_stop"; then
-	shift 1
-	/etc/init.d/framework stop
-fi
-
-# stop cvm
-killall -stop cvm
-
-# finally call reader
-./reader.lua -d "$1" 2> /mnt/us/kindlepdfviewer/crash.log || cat /mnt/us/kindlepdfviewer/crash.log
-
-# unmount system fonts
-if grep /mnt/us/kindlepdfviewer/fonts/host /proc/mounts; then
-	umount /mnt/us/kindlepdfviewer/fonts/host
-fi
-
-# always try to continue cvm
-killall -cont cvm || /etc/init.d/framework start