chore: sync with microG unofficial installer

Signed-off-by: ale5000 <15793015+ale5000-git@users.noreply.github.com>

Author: ale5000-git

.gitattributes

@@ -19,6 +19,7 @@ docs/CODEOWNERS     text eol=lf
 .shellcheckrc       text eol=lf
 .tool-versions      text eol=lf
 
+*.cff               text eol=lf
 *.gpg               text eol=lf
 *.js                text eol=lf
 *.json              text eol=lf

CITATION.cff

@@ -12,9 +12,7 @@ authors:
 identifiers:
   - type: other
     value: "License: GPL-3.0-or-later WITH LicenseRef-Archive-packaging-exception"
-    description: >-
-      Licensed under GPL-3.0-or-later WITH LicenseRef-Archive-packaging-exception.
-      The full text of this exception is available in the LICENSE-EXCEPTION.rst file at the root of this repository.
+    description: "The full text of the licenses can be found in the LICENSES directory."
 repository-code: "https://github.com/micro5k/google-sync-addon"
 abstract: "A tool to simplify Google sync adapters installation on Android devices."
 keywords:

REUSE.toml

@@ -27,7 +27,7 @@ SPDX-FileComment = [
 path = [
   "gradle/wrapper/gradle-wrapper.jar"
 ]
-SPDX-FileCopyrightText = "2007 the original author or authors"
+SPDX-FileCopyrightText = "2007 The original author or authors"
 SPDX-License-Identifier = "Apache-2.0"
 SPDX-FileComment = [
   "Sources: https://github.com/gradle/gradle/tree/master/subprojects/wrapper"

build.gradle

@@ -13,23 +13,23 @@ plugins {
     //id 'com.github.spotbugs' version '4.7.6'
 }
 
-def moduleProps = providers.fileContents(layout.projectDirectory.file('zip-content/module.prop'))
-    .asText
-    .map { text ->
-        def p = new Properties()
-        p.load(new StringReader(text))
-        return p
-    }
-
-//def moduleProps = providers.properties(layout.projectDirectory.file('zip-content/module.prop'))
-
 configure(project) {
     defaultTasks 'tasks'
 
     ext {
-        lazyDescription = moduleProps.map { it.getProperty('description', 'Unknown flashable ZIP') }
+        moduleProps = providers.fileContents(layout.projectDirectory.file('zip-content/module.prop'))
+            .asText
+            .map {
+                final Properties p = new Properties()
+                p.load(new StringReader(it))
+                p
+            } as Provider<Properties>
+
+        //moduleProps = providers.properties(layout.projectDirectory.file('zip-content/module.prop')) as Provider<Properties>
+
+        //lazyDescription = moduleProps.map { it.getProperty('description', 'Unknown flashable ZIP') }
         lazyVersion = moduleProps.map { it.getProperty('version', 'v0.0.0-unknown').trim().toLowerCase(Locale.ROOT) }
-        lazyGroup = moduleProps.map { it.getProperty('group', 'unknown').trim() }
+        //lazyGroup = moduleProps.map { it.getProperty('group', 'unknown') }
         lazyProjectId = moduleProps.map { it.getProperty('id', '').trim() }
         lazyOsName = providers.systemProperty('os.name')
     }
@@ -48,16 +48,47 @@ private Provider<String> getProjectId() {
     ext.lazyProjectId.map { it ?: { throw new InvalidUserDataException('id in "zip-content/module.prop" is empty or not set.') }() }
 }
 
+@Memoized
+private Provider<String> getLazyAuthor() {
+    moduleProps.map { it.getProperty('author', 'unknown') }
+}
+
+@Memoized
+private Provider<String> getLazyDescription() {
+    moduleProps.map { it.getProperty('description', 'Unknown flashable ZIP.') }
+}
+
+@Memoized
+private Provider<String> getLazyGroup() {
+    moduleProps.map { it.getProperty('group', 'unknown') }
+}
+
+@Memoized
+private Provider<String> getLazyOrg() {
+    moduleProps.map { it.getProperty('organization', 'unknown') }
+}
+
+@Memoized
+private Provider<String> getLazyLicense() {
+    moduleProps.map { it.getProperty('license', 'unknown') }
+}
+
 @Memoized
 private Provider<String> getScriptExt() {
     ext.lazyOsName.map { it.toLowerCase(Locale.ROOT).contains('windows') ? '.bat' : '.sh' }
 }
 
 @Memoized
 private Provider<String> getGitCommitHash() {
-    providers.exec {
-        commandLine 'git', 'rev-parse', '--short=8', 'HEAD'
-    }.standardOutput.asText.map{ it.trim() }.orElse('unknown')
+    providers.provider { layout.projectDirectory.dir('.git').asFile.exists() }.flatMap { exists ->
+        if(!exists) {
+            return providers.provider { 'NOGIT' }
+        }
+
+        providers.exec {
+            commandLine 'git', 'rev-parse', '--short=8', 'HEAD'
+        }.standardOutput.asText.map { "g${ it.trim() }" }.orElse('unknown')
+    }
 }
 
 @Memoized
@@ -68,14 +99,14 @@ private Provider<String> getMavenVersion() {
 private Provider<String> getZipName(String variant = '*') {
     ext.lazyVersion.flatMap { v ->
         getProjectId().zip(getGitCommitHash()) { id, hash ->
-            "${id}-${v}-g${hash}-${variant}-by-ale5000-signed.zip"
+            "${id}-${v}-${hash}-${variant}-by-ale5000-signed.zip"
         }
     }
 }
 
 /*private Provider<String> getZipName(String variant = '*') {
     providers.zip(getProjectId(), getGitCommitHash(), ext.lazyVersion) { id, hash, v ->
-        "${id}-${v}-g${hash}-${variant}-by-ale5000-signed.zip"
+        "${id}-${v}-${hash}-${variant}-by-ale5000-signed.zip"
     }
 }*/
 
@@ -143,32 +174,32 @@ project.afterEvaluate {
     // Keep it as lazy as possible while ensuring values show up correctly in 'gradlew properties',
     // since these Gradle properties and the maven-publish plugin don't support Providers.
 
-    description = "${-> ext.lazyDescription.get()}"
-    version = "${-> ext.lazyVersion.get()}"
-    group = "${-> ext.lazyGroup.get()}"
+    description = "${-> lazyDescription.get() }"
+    version = "${-> ext.lazyVersion.get() }"
+    group = "${-> lazyGroup.get() }"
 
     publishing {
         publications {
             maven(MavenPublication) {
-                groupId = 'com.github.micro5k'
-                artifactId = "${-> getProjectId().get()}"
-                version = "${-> getMavenVersion().get()}"
+                groupId = "com.github.${-> lazyOrg.get() }"
+                artifactId = "${-> getProjectId().get() }"
+                version = "${-> getMavenVersion().get() }"
                 pom {
-                    name = "${-> project.name}"
+                    name = "${-> project.name }"
                     packaging = 'zip'
 
                     licenses {
                         license {
-                            name = 'GPL-3.0-or-later WITH LicenseRef-Archive-packaging-exception'
+                            name = "${-> lazyLicense.get() }"
                             url = 'https://www.gnu.org/licenses/gpl-3.0.txt'
                             distribution = 'repo'
-                            comments = 'Licensed under GNU General Public License v3.0 or later with Archive Packaging Exception. Full license texts are available in LICENSES within the ZIP.'
+                            comments = 'The full text of the licenses can be found in the LICENSES directory contained in the ZIP archive.'
                         }
                     }
 
                     developers {
                         developer {
-                            id = 'ale5000'
+                            id = "${-> lazyAuthor.get() }"
                         }
                     }
                 }

build.sh

@@ -18,11 +18,11 @@ cat << 'LICENSE'
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version, w/ zip exception.
+  (at your option) any later version, w/ Archive Packaging Exception.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
@@ -119,17 +119,25 @@ OUT_DIR="${MAIN_DIR:?}/output"
 MODULE_ID="$(simple_get_prop 'id' "${MAIN_DIR:?}/zip-content/module.prop")" || ui_error 'Failed to parse the module id string'
 MODULE_VER="$(simple_get_prop 'version' "${MAIN_DIR:?}/zip-content/module.prop")" || ui_error 'Failed to parse the module version string'
 MODULE_AUTHOR="$(simple_get_prop 'author' "${MAIN_DIR:?}/zip-content/module.prop")" || ui_error 'Failed to parse the module author string'
+MODULE_ORG="$(simple_get_prop 'organization' "${MAIN_DIR:?}/zip-content/module.prop")" || ui_error 'Failed to parse the module organization string'
 case "${MODULE_VER:?}" in
   *'-alpha') MODULE_IS_ALPHA='true' ;;
   *) MODULE_IS_ALPHA='false' ;;
 esac
 
+if test "${GITHUB_ACTIONS:-false}" != 'false'; then
+  CI_NAME='github'
+elif test "${CI:-false}" != 'false'; then
+  CI_NAME="${CI:?}"
+else
+  CI_NAME='false'
+fi
+
 # Set short commit ID
-ZIP_SHORT_COMMIT_ID=''
-if test "${CI:-false}" != 'false'; then
+if test "${CI_NAME:?}" != 'false'; then
   ZIP_SHORT_COMMIT_ID="${CI_COMMIT_SHA:-${GITHUB_SHA:?Missing commit ID}}" || ZIP_SHORT_COMMIT_ID=''
 else
-  ZIP_SHORT_COMMIT_ID="$(git 2> /dev/null rev-parse HEAD)" || ZIP_SHORT_COMMIT_ID=''
+  ZIP_SHORT_COMMIT_ID="$(git 2> /dev/null rev-parse --short=8 HEAD)" || ZIP_SHORT_COMMIT_ID=''
 fi
 if test -n "${ZIP_SHORT_COMMIT_ID?}"; then
   ZIP_SHORT_COMMIT_ID="$(printf '%s' "${ZIP_SHORT_COMMIT_ID:?}" | cut -b '-8')" || ZIP_SHORT_COMMIT_ID=''
@@ -211,14 +219,14 @@ FILENAME_START="${MODULE_ID:?}-${MODULE_VER:?}-"
 FILENAME_MIDDLE="${FILENAME_COMMIT_ID:?}"
 FILENAME_END="-${BUILD_TYPE:?}-by-${MODULE_AUTHOR:?}"
 
-if test "${CI:-false}" != 'false'; then
+if test "${CI_NAME:?}" != 'false'; then
   if test -n "${CI_COMMIT_BRANCH-}" && test "${CI_COMMIT_BRANCH:?}" != "${CI_DEFAULT_BRANCH:-unknown}"; then
     BRANCH_NAME="$(sanitize_filename_part "${CI_COMMIT_BRANCH:?}" || :)" # GitLab
   elif test "${GITHUB_REF_TYPE-}" = 'branch' && test -n "${GITHUB_REF_NAME-}" && test "${GITHUB_REF_NAME:?}" != "${GITHUB_REPOSITORY_DEFAULT_BRANCH:-main}"; then
     BRANCH_NAME="$(sanitize_filename_part "${GITHUB_HEAD_REF:-${GITHUB_REF_NAME:?}}" || :)" # GitHub
   fi
   test -z "${BRANCH_NAME?}" || FILENAME_MIDDLE="${BRANCH_NAME:?}-${FILENAME_MIDDLE:?}"
-  if test "${CI_PROJECT_NAMESPACE:-${GITHUB_REPOSITORY_OWNER:-unknown}}" != 'micro''5k'; then
+  if test "${CI_PROJECT_NAMESPACE:-${GITHUB_REPOSITORY_OWNER:-unknown}}" != "${MODULE_ORG:?}"; then
     FILENAME_MIDDLE="fork-${FILENAME_MIDDLE:?}" # GitLab / GitHub
   fi
 else
@@ -376,7 +384,7 @@ cd "${OUT_DIR:?}" || ui_error 'Failed to change the folder' "${LINENO-}" "${FUNC
 
 # Cleanup remnants (skip on CI)
 pid=''
-if test "${CI:-false}" = 'false'; then
+if test "${CI_NAME:?}" = 'false'; then
   rm -r -f -- "${TEMP_DIR:?}" &
   #pid="${!}"
 fi