Merith/fix322

common/src/main/java/net/pcal/fastback/config/GitConfigImpl.java

@@ -36,7 +36,7 @@ static GitConfig load(final Git jgit) {
         return new GitConfigImpl(jgit.getRepository().getConfig());
     }
 
-    private final StoredConfig storedConfig;
+    public final StoredConfig storedConfig;
 
     GitConfigImpl(StoredConfig jgitConfig) {
         this.storedConfig = requireNonNull(jgitConfig);

common/src/main/java/net/pcal/fastback/config/OtherConfigKey.java

@@ -37,7 +37,11 @@ public String getDisplayName() {
     /**
      * We disable commit signing on git init.  https://github.com/pcal43/fastback/issues/165
      */
-    COMMIT_SIGNING_ENABLED("commit", null, "gpgsign");
+    COMMIT_SIGNING_ENABLED("commit", null, "gpgsign"),
+
+    // Allow reading the user's name and email from .gitconfig
+    USER_NAME("user", null, "name"),
+    USER_EMAIL("user", null, "email");
 
     private final String sectionName, subSectionName, settingName;
 

common/src/main/java/net/pcal/fastback/repo/RepoFactoryImpl.java

@@ -19,9 +19,11 @@
 package net.pcal.fastback.repo;
 
 import net.pcal.fastback.config.GitConfig.Updater;
+import net.pcal.fastback.config.GitConfigKey;
 import net.pcal.fastback.logging.UserLogger;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.StoredConfig;
 
 import java.io.File;
 import java.io.IOException;
@@ -58,6 +60,19 @@ public void doInit(final Path worldSaveDir, final UserLogger ulog) throws IOExce
             final Updater updater = repo.getConfig().updater();
             updater.set(COMMIT_SIGNING_ENABLED, false); // because some people have it set globally
             updater.set(IS_NATIVE_GIT_ENABLED, true);
+
+            StoredConfig config = jgit.getRepository().getConfig();
+            String userName = config.getString("user", null, "name");
+            String userEmail = config.getString("user", null, "email");
+
+            // If they don't have name/email set (as most non-git-users won't), provide synthetic values as a convenience.
+            // Presumbably, most folks don't care.
+            if (userName == null || userName.isEmpty() || userEmail == null || userEmail.isEmpty()) {
+                // set from fastback world id
+                String worldId = WorldIdUtils.getWorldIdInfo(worldSaveDir).wid().toString();
+                config.setString("user", null, "name", worldId);
+                config.setString("user", null, "email", worldId + "@fastback");
+            }
             updater.save();
             ulog.message(raw("Backups initialized.  Run '/backup local' to do your first backup.  '/backup help' for more options."));
         } catch (GitAPIException e) {

common/src/main/java/net/pcal/fastback/utils/ProcessUtils.java

@@ -51,8 +51,14 @@ public static int doExec(final String[] args, final Map<String, String> envOrigi
         // Output a few values that are important for debugging; don't indiscriminately dump everything or someone's going
         // to end up uploading a bunch of passwords into pastebin.
         syslog().debug("PATH: " + env.get("PATH"));
-        syslog().debug("USER: " + env.get("USER"));
-        syslog().debug("HOME: " + env.get("HOME"));
+        if (System.getProperty("os.name").toLowerCase().contains("windows")) {
+            syslog().debug("HOME: " + env.get("USERPROFILE"));
+            syslog().debug("USER: " + env.get("USERNAME"));
+        } else {
+            syslog().debug("HOME: " + env.get("HOME"));
+            syslog().debug("USER: " + env.get("USER"));
+        }
+
         final List<String> errorBuffer = new ArrayList<>();
         final Consumer<String> stdout = line -> {
             syslog().debug("[STDOUT] " + line);