From 77a8f9e28e82482d07e0d5cff4b749bc2fa1392e Mon Sep 17 00:00:00 2001 From: Grazvydas Ignotas Date: Wed, 11 May 2016 03:05:01 +0300 Subject: [PATCH] pandora-scripts: make op_osupgrade update .xinitrc --- recipes/pandora-system/pandora-scripts.bb | 2 +- .../pandora-scripts/op_osupgrade_work.sh | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb index d710285..bbadf65 100644 --- a/recipes/pandora-system/pandora-scripts.bb +++ b/recipes/pandora-system/pandora-scripts.bb @@ -5,7 +5,7 @@ COMPATIBLE_MACHINE = "omap3-pandora" RDEPENDS = "bash sed gawk grep zenity" -PR = "r166" +PR = "r167" SRC_URI = " \ file://op_bright.sh \ diff --git a/recipes/pandora-system/pandora-scripts/op_osupgrade_work.sh b/recipes/pandora-system/pandora-scripts/op_osupgrade_work.sh index 2f4241e..deaa1fa 100755 --- a/recipes/pandora-system/pandora-scripts/op_osupgrade_work.sh +++ b/recipes/pandora-system/pandora-scripts/op_osupgrade_work.sh @@ -39,6 +39,20 @@ fi # finally run the upgrade itself opkg upgrade +# update .xinitrc +xinitrc="/home/$SUDO_USER/.xinitrc" +if test -e "$xinitrc" && ! cmp -s /etc/skel/.xinitrc "$xinitrc"; then + # ... only from a known old version + known="5642b24d5d4570c6779807904506c162 b2cf2d45ef7f3bee9836105008c009a7" + md5=`md5sum "$xinitrc" | awk '{print $1}'` + for k in $known; do + if [ "$md5" = "$k" ]; then + cp -av /etc/skel/.xinitrc "$xinitrc" + break + fi + done +fi + # done touch /tmp/upgrade_ok sync -- 2.39.5