|
[-]
[+]
|
Changed |
_service:tar_git:sfos-moto_msm8960_jbbl-adaptation.spec
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:sfos-moto_msm8960_jbbl-adaptation-0.2.2.tar.bz2/real-upgrade.sh
^
|
| @@ -89,7 +89,7 @@
[ -x /usr/sbin/patchmanager ] && patchmanager --unapply-all || true
ssu lr
-echo -e "\n=== Make sure all repos are correct. Do you want to upgrade your system? [Y/n] ===\n"
+echo -e "\n=== Make sure all repos are correct because 'zypper' will not check it. Do you want to upgrade your system? [Y/n] ===\n"
read yn
[[ "$yn" == [nN] ]] && exit 1
|
|
[-]
[+]
|
Changed |
_service:tar_git:sfos-moto_msm8960_jbbl-adaptation-0.2.2.tar.bz2/upgrade.sh
^
|
| @@ -60,18 +60,18 @@
STOP_RELEASES="1.0.2 1.1.2 1.1.7 1.1.9 2.0.0 2.2.0 3.0.0 3.2.0 3.4.0 4.0.1 4.1.0 4.2.0 4.3.0 4.4.0"
CURRENT_RELEASE_NUM="$(release2num $CURRENT_RELEASE)"
if [ "$CURRENT_RELEASE_NUM" -ge 430 ]; then
- # There are some 4.4.0.58 leftovers on obs
- AVAILABLE_RELEASES="$(curl http://repo.sailfishos.org/obs/nemo:/testing:/hw:/motorola:/moto_msm8960_jbbl:/ 2>/dev/null | pcregrep -o1 '\"(\d\.\d\.\d\.\d+)' | grep -v "4\.4\.0\.58")"
+ # There are some 4.4.0.58 leftovers on obs, TODO: fixme for next problematic releases
+ AVAILABLE_RELEASES="$(curl http://repo.sailfishos.org/obs/nemo:/testing:/hw:/motorola:/moto_msm8960_jbbl:/ 2>/dev/null | pcregrep -o1 '\"(\d\.\d\.\d\.\d+)')"
else
AVAILABLE_RELEASES="$(curl http://repo.merproject.org/obs/nemo:/testing:/hw:/motorola:/moto_msm8960_jbbl/ 2>/dev/null | pcregrep -o1 '\"sailfishos_([\d\.]+)')"
fi
NEXT_RELEASE="$CURRENT_RELEASE"
# Found next Stop Release
-for r in $STOP_RELEASES; do
+for r in $STOP_RELEASES; do
nr="$(release2num $r)"
if [ $nr -gt $CURRENT_RELEASE_NUM ]; then
- NEXT_RELEASE="$(echo $AVAILABLE_RELEASES | tr ' ' '\n' | grep $r || true)"
+ NEXT_RELEASE="$(echo $AVAILABLE_RELEASES | tr ' ' '\n' | grep $r | tail -n1 || true)"
break
fi
done
|
