From dfb6ebabee46028d3ec25bd72d0affaa1dac70e2 Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Fri, 1 Jul 2016 14:19:38 -0400
Subject: Add the new JSON menu generation scripts to the "core" files
 installed (since they are basically another type of plugin).

---
 JsonMenu_Scripts/ls.json.sh          | 20 --------------------
 src-qt5/core/core.pro                | 14 ++++++++++----
 src-qt5/core/menu-scripts/ls.json.sh | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 24 deletions(-)
 delete mode 100755 JsonMenu_Scripts/ls.json.sh
 create mode 100755 src-qt5/core/menu-scripts/ls.json.sh

diff --git a/JsonMenu_Scripts/ls.json.sh b/JsonMenu_Scripts/ls.json.sh
deleted file mode 100755
index 626912cb..00000000
--- a/JsonMenu_Scripts/ls.json.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-DIR=${1}
-if [ "$1" == "" ] ; then
-  DIR=`pwd`
-fi
-
-ls "${DIR}" > /tmp/.tmp.lines.$$ 
-while read name
-do
-  if [ -n "${OUT}" ] ; then
-    OUT="${OUT},"
-  fi
-  if [ -d "${DIR}/${name}" ] ; then
-    OUT="${OUT} \"${name}\" : { \"type\" : \"jsonmenu\", \"exec\" : \"${0} \\\"${DIR}/${name}\\\"\", \"icon\":\"folder\"}"
-  else
-    OUT="${OUT} \"${name}\" : { \"type\" : \"item\", \"icon\":\"unknown\", \"action\" : \"xdg-open \\\"${DIR}/${name}\\\"\"}"
-  fi
-done < /tmp/.tmp.lines.$$
-rm /tmp/.tmp.lines.$$
-echo "{ ${OUT} }"
diff --git a/src-qt5/core/core.pro b/src-qt5/core/core.pro
index 029c1355..a0d0db3e 100644
--- a/src-qt5/core/core.pro
+++ b/src-qt5/core/core.pro
@@ -5,10 +5,10 @@ TEMPLATE = subdirs
 CONFIG += recursive
 
 SUBDIRS+= libLumina \
-	 lumina-desktop \
-	 lumina-session \
-	 lumina-open \
-	 lumina-info
+	lumina-desktop \
+	lumina-session \
+	lumina-open \
+	lumina-info
 #	lumina-wm-INCOMPLETE \
 #	lumina-checkpass
 
@@ -18,3 +18,9 @@ lumina-desktop.depends = libLumina
 lumina-session.depends = libLumina
 lumina-open.depends = libLumina
 lumina-info.depends = libLumina
+
+#Also install any special menu scripts
+scripts.path = $${L_SHAREDIR}/lumina-desktop/menu-scripts
+scripts.files = menu-scripts/*
+
+INSTALLS+=scripts
diff --git a/src-qt5/core/menu-scripts/ls.json.sh b/src-qt5/core/menu-scripts/ls.json.sh
new file mode 100755
index 00000000..626912cb
--- /dev/null
+++ b/src-qt5/core/menu-scripts/ls.json.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+DIR=${1}
+if [ "$1" == "" ] ; then
+  DIR=`pwd`
+fi
+
+ls "${DIR}" > /tmp/.tmp.lines.$$ 
+while read name
+do
+  if [ -n "${OUT}" ] ; then
+    OUT="${OUT},"
+  fi
+  if [ -d "${DIR}/${name}" ] ; then
+    OUT="${OUT} \"${name}\" : { \"type\" : \"jsonmenu\", \"exec\" : \"${0} \\\"${DIR}/${name}\\\"\", \"icon\":\"folder\"}"
+  else
+    OUT="${OUT} \"${name}\" : { \"type\" : \"item\", \"icon\":\"unknown\", \"action\" : \"xdg-open \\\"${DIR}/${name}\\\"\"}"
+  fi
+done < /tmp/.tmp.lines.$$
+rm /tmp/.tmp.lines.$$
+echo "{ ${OUT} }"
-- 
cgit