diff --git a/love-release.sh b/love-release.sh index b8e1e93..0170663 100755 --- a/love-release.sh +++ b/love-release.sh @@ -756,7 +756,7 @@ if [ "$RELEASE_APK" = true ]; then if [ -d "$LOVE_ANDROID_DIR" ]; then cd "$LOVE_ANDROID_DIR" git checkout -- . - rm -rf src/com + rm -rf src/com bin gen LOCAL=$(git rev-parse @) REMOTE=$(git rev-parse @{u}) BASE=$(git merge-base @ @{u}) @@ -778,82 +778,17 @@ if [ "$RELEASE_APK" = true ]; then mkdir -p "$LOVE_ANDROID_DIR"/assets cp "$PROJECT_NAME".love "$LOVE_ANDROID_DIR"/assets/game.love cd "$LOVE_ANDROID_DIR" - MAINTAINER_USERNAME=${MAINTAINER_NAME// /-} + MAINTAINER_USERNAME=${MAINTAINER_NAME// /_} ACTIVITY=${PROJECT_NAME// /_}Activity + ANDROID_VERSION=$(grep -Eo -m 1 "[0-9]+.[0-9]+.[0-9]+[a-z]*" AndroidManifest.xml) + sed -i "s/org.love2d.android/com.${MAINTAINER_USERNAME}.${PACKAGE_NAME}/" AndroidManifest.xml + sed -i "s/$ANDROID_VERSION/${ANDROID_VERSION}-${PACKAGE_NAME}-v${PROJECT_VERSION}/" AndroidManifest.xml + sed -i "0,/LÖVE for Android/s//$PROJECT_NAME $PROJECT_VERSION/" AndroidManifest.xml + sed -i "s/LÖVE for Android/$PROJECT_NAME/" AndroidManifest.xml + sed -i "s/GameActivity/$ACTIVITY/" AndroidManifest.xml -echo " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -" > AndroidManifest.xml - -mkdir -p src/com/$MAINTAINER_USERNAME/$PACKAGE_NAME -echo " -package com.${MAINTAINER_USERNAME}.${PACKAGE_NAME}; + mkdir -p src/com/$MAINTAINER_USERNAME/$PACKAGE_NAME +echo "package com.${MAINTAINER_USERNAME}.${PACKAGE_NAME}; import org.love2d.android.GameActivity; public class $ACTIVITY extends GameActivity {}