summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2013-11-11 01:24:33 +0159
committerThomas Backlund <tmb@mageia.org>2013-11-11 01:24:33 +0159
commit830590691f7272ab8c1f0db29887c2bd8fc93874 (patch)
treec59c302aa8a90bf734c1e5f58f4666bde5f5417d
parentd7d5ba42ce1e234de688ae6648145e71f821c92e (diff)
downloaddrakx-830590691f7272ab8c1f0db29887c2bd8fc93874.tar
drakx-830590691f7272ab8c1f0db29887c2bd8fc93874.tar.gz
drakx-830590691f7272ab8c1f0db29887c2bd8fc93874.tar.bz2
drakx-830590691f7272ab8c1f0db29887c2bd8fc93874.tar.xz
drakx-830590691f7272ab8c1f0db29887c2bd8fc93874.zip
properly escape 5096UID
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/standalone/polkit/Makefile2
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index f6b795f46..9c9f00705 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
-- use $UID instead of $(id -u)
+- properly escape $$UID
+- use $$UID instead of $$(id -u)
Version 15.72.1 - 9 November 2013
diff --git a/perl-install/standalone/polkit/Makefile b/perl-install/standalone/polkit/Makefile
index cadd056aa..3a1736983 100644
--- a/perl-install/standalone/polkit/Makefile
+++ b/perl-install/standalone/polkit/Makefile
@@ -13,7 +13,7 @@ clean:
rm -f $(WRAPPERS) $(POLICY)
%: org.mageia.%.policy.in
- @echo -e '#!/bin/sh\nif [[ "$UID" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*\nelse\n exec $(LIBEXECDIR)/$@ $$""*\nfi\n' > $@
+ @echo -e '#!/bin/sh\nif [[ "$$UID" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*\nelse\n exec $(LIBEXECDIR)/$@ $$""*\nfi\n' > $@
%.policy: %.policy.in
intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache