diff --git a/x230/NEWS b/x230/NEWS index a873ac2..bab346a 100644 --- a/x230/NEWS +++ b/x230/NEWS @@ -1,4 +1,10 @@ +skulls-x230 0.0.12 - unreleased +---------------------------------------- +This release includes the following changes: +* simplify unpacking the release archive by including a directory + + skulls-x230 0.0.11 - released 2018-11-05 ---------------------------------------- This release includes the following changes: diff --git a/x230/README.md b/x230/README.md index 48111ee..4402ff9 100644 --- a/x230/README.md +++ b/x230/README.md @@ -165,9 +165,8 @@ based supply for a second USB port (like [this](https://de.aliexpress.com/item/1 #### unpack the Skulls release archive - mkdir skulls - tar -xf skulls-x230-.tar.xz -C skulls - cd skulls + tar -xf skulls-x230-.tar.xz + cd skulls-x230- #### ifd unlock and me_cleaner: the 8MB chip diff --git a/x230/release.sh b/x230/release.sh index cfe6ea9..e22638b 100755 --- a/x230/release.sh +++ b/x230/release.sh @@ -98,37 +98,33 @@ if [ ! "$filesize" -eq "$reference_filesize" ] ; then exit 1 fi +RELEASE_DIR="skulls-x230-${version}" +rm -rf "$RELEASE_DIR" +mkdir -p "$RELEASE_DIR" + # copy-in the ROM -cp "${RELEASE_IMAGE}" . +cp "${RELEASE_IMAGE}" "$RELEASE_DIR" + RELEASE_IMAGE_FILE=$(basename "${RELEASE_IMAGE}") -sha256sum ${RELEASE_IMAGE_FILE} > "${RELEASE_IMAGE_FILE}.sha256" - -# copy-in device independent stuff -cp ../SOURCE.md . - -tar -cJf skulls-x230-"${version}".tar.xz \ - README.md \ - NEWS \ - util \ - LICENSE* \ - skulls_common.sh \ - x230_before_first_install.sh \ - x230_skulls.sh \ - x230_heads.sh \ - external_install_bottom.sh \ - external_install_top.sh \ +sha256sum ${RELEASE_DIR}/${RELEASE_IMAGE_FILE} > "${RELEASE_DIR}/${RELEASE_IMAGE_FILE}.sha256" + +# copy in device independent stuff +cp ../SOURCE.md "$RELEASE_DIR" + +# copy in x230 stuff +cp -a README.md NEWS util LICENSE* skulls_common.sh \ + x230_before_first_install.sh x230_skulls.sh x230_heads.sh \ + external_install_bottom.sh external_install_top.sh \ upgrade.sh \ - SOURCE.md \ - "${RELEASE_IMAGE_FILE}" \ - "${RELEASE_IMAGE_FILE}.sha256" + "$RELEASE_DIR" + +tar -cJf "$RELEASE_DIR".tar.xz "$RELEASE_DIR" -rm "${RELEASE_IMAGE_FILE}" -rm "${RELEASE_IMAGE_FILE}.sha256" -rm SOURCE.md +rm -rf "$RELEASE_DIR" git commit -a -m "update to ${version}" git tag -s "${version}" -m "skulls-x230 ${version}" -sha256sum skulls-x230-"${version}".tar.xz > skulls-x230-"${version}".tar.xz.sha256 -sha512sum skulls-x230-"${version}".tar.xz > skulls-x230-"${version}".tar.xz.sha512 -gpg -b -a skulls-x230-"${version}".tar.xz +sha256sum "$RELEASE_DIR".tar.xz > "$RELEASE_DIR".tar.xz.sha256 +sha512sum "$RELEASE_DIR".tar.xz > "$RELEASE_DIR".tar.xz.sha512 +gpg -b -a "$RELEASE_DIR".tar.xz