build: adjust install & getty for cui/ subdirectory

grommunio · Jun 27, 2022 · 39a9c65 · 39a9c65
1 parent d1b96fe
commit 39a9c65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -10,11 +10,11 @@ unitdir = /usr/lib/systemd/system
 all:
 
 install:
-	${MKDIR_P} ${DESTDIR}${pkglibexecdir} ${DESTDIR}${sbindir} ${DESTDIR}${unitdir}
+	${MKDIR_P} ${DESTDIR}${pkglibexecdir}/cui ${DESTDIR}${sbindir} ${DESTDIR}${unitdir}
 	cp -afv getty *.py ${DESTDIR}${pkglibexecdir}/
 	cp -afv setlogcons.service ${DESTDIR}${unitdir}/
 	# overwrite desired
-	cp -afv cui/*.py ${DESTDIR}${pkglibexecdir}/
+	cp -afv cui/*.py ${DESTDIR}${pkglibexecdir}/cui/
 	${SED} 's!@pkglibexecdir@!${pkglibexecdir}!g' <grommunio-cui.in >${DESTDIR}${sbindir}/grommunio-cui
 	chmod a+x ${DESTDIR}${sbindir}/grommunio-cui
 	${SED} 's!@pkglibexecdir@!${pkglibexecdir}!g' <grommunio-cui@.service.in >${DESTDIR}${unitdir}/grommunio-cui@.service
diff --git a/getty b/getty
@@ -6,7 +6,6 @@ echo
 echo -e " \x1b[36m▼\x1b[0m Loading grommunio console user interface"
 echo
 if [ -d /usr/libexec/grommunio-cui ]; then
-  PYTHONPATH="/usr/libexec/grommunio-cui" exec "/usr/bin/python3" "/usr/libexec/grommunio-cui/__init__.py"
-else
-  PYTHONPATH="/usr/libexec/grammm-cui" exec "/usr/bin/python3" "/usr/libexec/grammm-cui/__init__.py"
+	PYTHONPATH="/usr/libexec/grommunio-cui/cui" exec "/usr/bin/python3" \
+		"/usr/libexec/grommunio-cui/__init__.py"
 fi