From 0ab652fcd5f62ebe9eed571bcd334c612e4df449 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Thu, 24 Sep 2015 09:28:57 +0100
Subject: [PATCH] Ensure that gogs repos are in the user subdirectory

---
 src/freedombone | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/freedombone b/src/freedombone
index b0cf778e..6243e2ee 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -2595,6 +2595,7 @@ function create_backup_script {
       echo 'echo "Obtaining Gogs settings backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
       backup_directory_to_usb '/home/git/go/src/github.com/gogits/gogs/custom' 'gogs'
       echo 'echo "Obtaining Gogs repos backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
+      echo "mv /home/git/gogs-repositories/*.git /home/git/gogs-repositories/$MY_USERNAME" >> /usr/bin/$BACKUP_SCRIPT_NAME
       backup_directory_to_usb '/home/git/gogs-repositories' 'gogsrepos'
       echo 'echo "Obtaining Gogs authorized_keys backup"' >> /usr/bin/$BACKUP_SCRIPT_NAME
       backup_directory_to_usb '/home/git/.ssh' 'gogsssh'
@@ -3865,6 +3866,7 @@ function backup_to_friends_servers {
       echo 'echo "Obtaining Gogs settings backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       backup_directory_to_friend '/home/git/go/src/github.com/gogits/gogs/custom' 'gogs'
       echo 'echo "Obtaining Gogs repos backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
+      echo "mv /home/git/gogs-repositories/*.git /home/git/gogs-repositories/$MY_USERNAME" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
       backup_directory_to_friend '/home/git/gogs-repositories' 'gogsrepos'
 
       echo 'echo "Obtaining Gogs authorized_keys backup"' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
@@ -9832,6 +9834,7 @@ function create_upgrade_script {
   if grep -Fxq "install_gogs" $COMPLETION_FILE; then
       echo '' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
       echo '# gogs' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
+      echo "mv /home/git/gogs-repositories/*.git /home/git/gogs-repositories/$MY_USERNAME" >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
       echo 'cd /home/git/go/src/github.com/gogits/gogs' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
       echo 'git stash' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME
       echo 'git stash drop' >> /etc/cron.weekly/$UPGRADE_SCRIPT_NAME