From 96e8e5c796eac2f9b7fef5dd07e6099d0f770c61 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 8 Jul 2016 16:07:55 +0100
Subject: [PATCH] Move user permissions function to utils
---
src/freedombone-restore-local | 11 -----------
src/freedombone-utils-backup | 13 ++++++++++++-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/freedombone-restore-local b/src/freedombone-restore-local
index 4c1d90b33..9cdb54a9e 100755
--- a/src/freedombone-restore-local
+++ b/src/freedombone-restore-local
@@ -76,17 +76,6 @@ GIT_DOMAIN_NAME=
WIKI_DOMAIN_NAME=
FULLBLOG_DOMAIN_NAME=
-# after user files have been restored permissions may need to be set
-function set_user_permissions {
- echo $"Setting permissions"
- for d in /home/*/ ; do
- USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
- if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
- chown -R $USERNAME:$USERNAME /home/$USERNAME
- fi
- done
-}
-
function check_backup_exists {
if [ ! -d $USB_MOUNT/backup ]; then
echo $"No backup directory found on the USB drive."
diff --git a/src/freedombone-utils-backup b/src/freedombone-utils-backup
index 720e13c49..2b438f32a 100755
--- a/src/freedombone-utils-backup
+++ b/src/freedombone-utils-backup
@@ -131,7 +131,7 @@ function backup_mount_drive {
if [ $3 ]; then
RESTORE_APP=$3
fi
-
+
# check that the backup destination is available
if [ ! -b $USB_DRIVE ]; then
echo $"Please attach a USB drive"
@@ -270,4 +270,15 @@ function backup_database_to_usb {
backup_directory_to_usb /root/temp${database_name}data ${database_name}data
}
+# after user files have been restored permissions may need to be set
+function set_user_permissions {
+ echo $"Setting permissions"
+ for d in /home/*/ ; do
+ USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
+ if [[ $USERNAME != "git" && $USERNAME != "mirrors" && $USERNAME != "sync" ]]; then
+ chown -R $USERNAME:$USERNAME /home/$USERNAME
+ fi
+ done
+}
+
# NOTE: deliberately no exit 0
--
GitLab