[preinst,makefile] ok we can blame this one entirely on me

hbang · Mar 19, 2018 · cbff839 · cbff839
1 parent 4900f95
commit cbff839
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -61,7 +61,7 @@ ifneq ($(PACKAGE_BUILDNAME)$(IMAGENT),debug)
 endif
 
 	$(ECHO_NOTHING)cp Resources/*.png $(THEOS_STAGING_DIR)/System/Library/Frameworks/UIKit.framework$(ECHO_END)
-	$(ECHO_NOTHING)ln -s /usr/lib/TypeStatus/TypeStatusProvider.framework $(THEOS_STAGING_DIR)/Library/Frameworks/TypeStatusProvider.framework$(ECHO_END)
+	$(ECHO_NOTHING)ln -s /usr/lib/TypeStatusProvider.framework $(THEOS_STAGING_DIR)/Library/Frameworks/TypeStatusProvider.framework$(ECHO_END)
 
 docs: stage
 	$(ECHO_BEGIN)$(PRINT_FORMAT_MAKING) "Generating docs"; jazzy --module-version $(THEOS_PACKAGE_BASE_VERSION)$(ECHO_END)

diff --git a/preinst b/preinst
@@ -2,7 +2,7 @@
 set -e
 
 # delete a broken symlink if necessary
-if [[ -h /Library/TypeStatus && "$(readlink -eq /Library/TypeStatus)" == "" ]]; then
+if [[ -h /Library/TypeStatus && "$(readlink -q /Library/TypeStatus)" == "" ]]; then
 	rm /Library/TypeStatus
 fi
 
@@ -34,7 +34,7 @@ if [[ ! -h /Library/TypeStatus ]]; then
 fi
 
 # if the framework leads to the wrong place, fix it (why does this happen?)
-fw_link="$(readlink -eq /Library/Frameworks/TypeStatusProvider.framework)"
+fw_link="$(readlink -q /Library/Frameworks/TypeStatusProvider.framework || true)"
 
 if [[ "$fw_link" == "" || "$fw_link" == "/usr/lib/TypeStatus/TypeStatusProvider.framework" ]]; then
 	rm -rf /Library/Frameworks/TypeStatusProvider.framework