fix devmode rebase

Author: inffy

system_files/shared/usr/share/ublue-os/just/system.just

@@ -59,20 +59,34 @@ toggle-devmode:
     IMAGE_INFO_FILE="${IMAGE_INFO_FILE:-/usr/share/ublue-os/image-info.json}"
     IMAGE_NAME="$(jq -rc '."image-name"' "${IMAGE_INFO_FILE}")"
     IMAGE_REF="$(jq -rc '."image-ref"' "${IMAGE_INFO_FILE}" | sed "s/.*ghcr/ghcr/")"
-    CURRENT_IMAGE="${IMAGE_REF}:$(jq -rc '."image-tag"' "${IMAGE_INFO_FILE}")"
+    IMAGE_TAG="$(jq -rc '."image-tag"' "${IMAGE_INFO_FILE}")"
+    CURRENT_IMAGE="${IMAGE_REF}:${IMAGE_TAG}"
     set +e
 
-    if grep -q -E -e "dx$" <<< "${IMAGE_NAME}" ; then
+    if grep -q -E -e "-dx(-|$)" <<< "${IMAGE_NAME}" ; then
         gum confirm "Would you like to disable developer mode?" || exit 0
         echo "Rebasing to a non developer image"
-        NEW_IMAGE="$(sed "s/\-dx//" <<< $CURRENT_IMAGE)"
+        # Remove -dx from image name
+        NEW_NAME="$(sed "s|-dx-|-|; s|-dx$||" <<< "${IMAGE_NAME}")"
+        NEW_IMAGE="${IMAGE_REF}:${IMAGE_TAG}"
+        NEW_IMAGE="${NEW_IMAGE/${IMAGE_NAME}:/${NEW_NAME}:}"
         pkexec bootc switch --enforce-container-sigpolicy "${NEW_IMAGE}"
         exit 0
     fi
 
     gum confirm "Would you like to enable developer mode?" || exit 0
     echo "Rebasing to a developer image"
-    NEW_IMAGE="$(sed "s/${IMAGE_NAME}/${IMAGE_NAME}-dx/" <<< "${CURRENT_IMAGE}")"
+    # Insert -dx after first component of image name
+    FIRST="${IMAGE_NAME%%-*}"
+    if [[ "${IMAGE_NAME}" == "${FIRST}" ]]; then
+        # No hyphen in name, append -dx
+        NEW_NAME="${IMAGE_NAME}-dx"
+    else
+        # Has hyphen, insert -dx after first component
+        REST="${IMAGE_NAME#*-}"
+        NEW_NAME="${FIRST}-dx-${REST}"
+    fi
+    NEW_IMAGE="${CURRENT_IMAGE/${IMAGE_NAME}:/${NEW_NAME}:}"
     pkexec bootc switch --enforce-container-sigpolicy "${NEW_IMAGE}"
     if gum confirm "Do you want to also install the default development flatpaks?" ; then
         ujust install-system-flatpaks 0 1