[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 5 commits: update-chromium-homepage: Don't complain about non-existing config file when…

[Mike Gabriel]

Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config


Commits:
e5a12d94 by Mike Gabriel at 2018-10-24T19:40:38Z
update-chromium-homepage: Don't complain about non-existing config file  when attempting its removal.

- - - - -
93266dbc by Mike Gabriel at 2018-10-24T19:41:38Z
update-chromium-homepage: Make sure the target dir of $etcfile exists.

- - - - -
150f3464 by Mike Gabriel at 2018-10-24T19:48:26Z
update-chromium-homepage: Don't statically set http://www as homepage, user detected homepage instead. (Closes: #911790)

- - - - -
d8e0034f by Mike Gabriel at 2018-10-24T19:49:00Z
update-firefox-homepage: Don't complain about non-existing config file  when attempting its removal.

- - - - -
4535658d by Mike Gabriel at 2018-10-24T19:49:24Z
update-firefox-homepage: Make sure the target dir of $etcfile exists.

- - - - -


3 changed files:

- debian/changelog
- share/debian-edu-config/tools/update-chromium-homepage
- share/debian-edu-config/tools/update-firefox-homepage


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+debian-edu-config (2.10.42) UNRELEASED; urgency=medium
+
+  * update-chromium-homepage: Don't complain about non-existing config file 
+    when attempting its removal.
+  * update-chromium-homepage: Make sure the target dir of $etcfile exists.
+  * update-chromium-homepage: Don't statically set http://www as homepage, user
+    detected homepage instead. (Closes: #911790)
+  * update-firefox-homepage: Don't complain about non-existing config file 
+    when attempting its removal.
+  * update-firefox-homepage: Make sure the target dir of $etcfile exists.
+
+ -- Mike Gabriel <sunweaver at debian.org>  Wed, 24 Oct 2018 21:39:30 +0200
+
 debian-edu-config (2.10.41) unstable; urgency=medium
 
   [ Mike Gabriel ]


=====================================
share/debian-edu-config/tools/update-chromium-homepage
=====================================
@@ -6,6 +6,7 @@
 set -e
 
 etcfile=/etc/chromium/policies/managed/debian-edu-homepage-ldap.json
+mkdir -p $(dirname $etcfile)
 
 if [ ldap:homepage = "$1" ] ; then
     # Allow lookup script to be replaced using /etc/debian-edu/config
@@ -26,7 +27,7 @@ if [ -z "$url" ] || [ "about:blank" = "$url" ]; then
 else
     cat > $etcfile.new <<EOF
 {
-  "HomepageLocation" : "https://www",
+  "HomepageLocation" : "$url",
   "HomepageIsNewTabPage" : false
 }
 EOF


=====================================
share/debian-edu-config/tools/update-firefox-homepage
=====================================
@@ -6,6 +6,7 @@
 set -e
 
 etcfile=/etc/firefox-esr/debian-edu-homepage-ldap.js
+mkdir -p $(dirname $etcfile)
 
 if [ ldap:homepage = "$1" ] ; then
     # Allow lookup script to be replaced using /etc/debian-edu/config
@@ -22,7 +23,7 @@ else
 fi
 
 if [ -z "$url" ] || [ "about:blank" = "$url" ]; then
-    rm $etcfile
+    rm -f $etcfile
 else
     cat > $etcfile.new <<EOF
 # Generated from LDAP



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/ef68a0521d42f17b1347133eeb0884ffe10eca01...4535658de80e0a7a6ce43cbc4663209951f92cd5

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/ef68a0521d42f17b1347133eeb0884ffe10eca01...4535658de80e0a7a6ce43cbc4663209951f92cd5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20181024/88312860/attachment-0001.html>