ubuntukylin-members team mailing list archive

[Anthony Wong <anthony.wong@xxxxxxxxxx>]

Anthony Wong has proposed merging lp:~anthonywong/ubuntukylin-default-settings/fix-1374244 into lp:ubuntukylin-default-settings.

Requested reviews:
  ShuiLu Pi (pishuilu1128)
Related bugs:
  Bug #1374244 in ubuntukylin-default-settings: "Installing ubuntukylin-default-settings makes the substitution of 'Ubuntu' in /etc/os-release recursively"
  https://bugs.launchpad.net/ubuntukylin-default-settings/+bug/1374244

For more details, see:
https://code.launchpad.net/~anthonywong/ubuntukylin-default-settings/fix-1374244/+merge/236060
-- 
https://code.launchpad.net/~anthonywong/ubuntukylin-default-settings/fix-1374244/+merge/236060
Your team Ubuntu Kylin Members is subscribed to branch lp:ubuntukylin-default-settings.

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-22 16:36:28 +0000
+++ debian/changelog	2014-09-26 05:03:31 +0000
@@ -1,3 +1,10 @@
+ubuntukylin-default-settings (1.3.1) utopic; urgency=low
+
+  * Be more specific in replacing Ubuntu in /etc/os-release to prevent
+    recursive substitution. (LP: #1374244)
+
+ -- Anthony Wong <anthony.wong@xxxxxxxxxx>  Fri, 26 Sep 2014 12:55:22 +0800
+
 ubuntukylin-default-settings (1.3.0) utopic; urgency=low
 
   * Eliminate the pop up of incomplete language support (LP: #1335776)

=== modified file 'debian/ubuntukylin-default-settings.preinst'
--- debian/ubuntukylin-default-settings.preinst	2014-09-19 09:22:17 +0000
+++ debian/ubuntukylin-default-settings.preinst	2014-09-26 05:03:31 +0000
@@ -12,7 +12,8 @@
 	for item in $files; do
 		dpkg-divert --package $package --rename --divert "/$item"".orig-brand" --add "/$item"
 	done
-        sed -i "/NAME/s/Ubuntu/Ubuntu Kylin/g" /etc/os-release
+        sed -i 's/\(NAME="Ubuntu\)"/\1 Kylin"/' /etc/os-release 
+        sed -i 's/\(PRETTY_NAME="Ubuntu\) 1/\1 Kylin 1/' /etc/os-release
         rm -f /etc/ubuntukylin-release
         rm -f /usr/share/language-support/incomplete-language-support-gnome.note
 fi