diff --git a/fdroidMergeRequest.sh b/fdroidMergeRequest.sh index 12e990c618e65894a7d5ee732cd77272d739c623..23bb0ce9185542b01f741356d1ddb6e9ba6bd8bb 100755 --- a/fdroidMergeRequest.sh +++ b/fdroidMergeRequest.sh @@ -44,37 +44,37 @@ cp ${METADATA_FOLDER}/cx.ring.yml ${METADATA_FOLDER}/cx.ring.yml_ head -n -11 ${METADATA_FOLDER}/cx.ring.yml_ > ${METADATA_FOLDER}/cx.ring.yml -echo " - versionName: '${versionName}' +echo " - versionName: ${versionName} versionCode: ${versionCode} commit: ${commit} timeout: 10800 subdir: client-android/ring-android/app submodules: true gradle: - - noPush + - noPush rm: - - client-electron - - client-gnome - - client-ios - - client-macosx - - client-uwp - - client-windows - - docker - - docs - - lrc - - packaging - - scripts + - client-electron + - client-gnome + - client-ios + - client-macosx + - client-uwp + - client-windows + - docker + - docs + - lrc + - packaging + - scripts build: - - cd ../.. - - export ANDROID_NDK_ROOT=\"\$ANDROID_NDK\" - - export ANDROID_ABI=\"armeabi-v7a arm64-v8a x86\" - - ./compile.sh --release --no-gradle + - cd ../.. + - export ANDROID_NDK_ROOT=\"\$ANDROID_NDK\" + - export ANDROID_ABI=\"armeabi-v7a arm64-v8a x86\" + - ./compile.sh --release --no-gradle ndk: ${ndkVersion}" >> ${METADATA_FOLDER}/cx.ring.yml tail -n 12 ${METADATA_FOLDER}/cx.ring.yml_ | head -n -2 >> ${METADATA_FOLDER}/cx.ring.yml -echo "CurrentVersion: '${versionName}'" >> ${METADATA_FOLDER}/cx.ring.yml +echo "CurrentVersion: ${versionName}" >> ${METADATA_FOLDER}/cx.ring.yml echo "CurrentVersionCode: ${versionCode}" >> ${METADATA_FOLDER}/cx.ring.yml rm ${METADATA_FOLDER}/cx.ring.yml_