Skip to content

Commit 8c95422

Browse files
committed
Fix bugs in uninstall rules.
1 parent b20f715 commit 8c95422

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ uninstall: $(TEXINFTHESIS)/infthesis.cls
5757
texhash --verbose $(INSTDIR) && \
5858
echo "Uninstallation complete." || echo "Uninstallation failed."
5959
@echo "Attempting to removing directory structure."
60-
@rmdir -v -p $(TEXINFTHESIS) && true || true
60+
@rmdir -v -p $(TEXINFTHESIS) || true
6161

6262
install-eushield:
6363
@mkdir -v -p $(TEXEUSHIELD)
@@ -74,8 +74,8 @@ uninstall-eushield:
7474
rm -v $(TEXEUSHIELD)/$(dep) && \
7575
echo "Uninstallation of $(dep) complete." || echo "Uninstallation of $(dep) failed." ; \
7676
)
77-
texhash $(INSTDIR) && \
78-
@rmdir -p -v $(TEXEUSHIELD) && true || true
77+
rmdir -p -v $(TEXEUSHIELD) || true
78+
texhash $(INSTDIR)
7979

8080
install-logo-inf:
8181
@mkdir -v -p $(INFLOGODIR)
@@ -91,7 +91,7 @@ uninstall-logo-inf:
9191
rm -v $(INFLOGODIR)/$(dep) && \
9292
echo "Uninstallation of $(dep) complete." || echo "Uninstallation of $(dep) failed." ; \
9393
)
94-
@rmdir -v -p $(INFLOGODIR) && true || true
94+
@rmdir -v -p $(INFLOGODIR) || true
9595

9696

9797
install-logo-cdtppar:
@@ -105,10 +105,10 @@ install-logo-cdtppar:
105105
uninstall-logo-cdtppar:
106106
$(foreach dep, $(CDTPPARLOGO), \
107107
echo "Uninstalling $(dep)..." && \
108-
curl -o $(CDTPPARLOGODIR)/$(dep) -O $(CDTPPARURL)/$(dep) && \
108+
rm -v $(CDTPPARLOGODIR)/$(dep) && \
109109
echo "Uninstallation of $(dep) complete." || echo "Uninstallation of $(dep) failed." ; \
110110
)
111-
@rmdir -v -p $(CDTPPARLOGODIR) && true || true
111+
@rmdir -v -p $(CDTPPARLOGODIR) || true
112112

113113
install-logo-epsrc:
114114
@mkdir -v -p $(EPSRCLOGODIR)
@@ -125,7 +125,7 @@ uninstall-logo-epsrc:
125125
$(eval dep1 = $(word 1,$(subst :, ,$(dep)))) \
126126
$(eval dep2 = $(word 2,$(subst :, ,$(dep)))) \
127127
echo "Uninstalling $(dep2)..." && \
128-
curl -o $(EPSRCLOGODIR)/$(dep2) -O $(EPSRCURL)/$(dep1) && \
128+
rm -v $(EPSRCLOGODIR)/$(dep2) && \
129129
echo "Uninstallation of $(dep2) complete." || echo "Uninstallation of $(dep2) failed." ; \
130130
)
131-
@rmdir -v -p $(EPSRCLOGODIR) && true || true
131+
@rmdir -v -p $(EPSRCLOGODIR) || true

0 commit comments

Comments
 (0)