From: Bastian Dehn <hhaalo@arcor.de>
Date: Sat, 14 Jul 2018 08:38:28 +0000 (+0200)
Subject: change: Method Klammern Konvention
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=1975d42325535aa6246853d949ec810fa800372d;p=simple-backup.git

change: Method Klammern Konvention
---

diff --git a/backup b/backup
index a4f36ca..a45fc33 100755
--- a/backup
+++ b/backup
@@ -3,14 +3,16 @@
 ### macht Hardlinks auf unveränderte Daten zum
 ### vorhaerigen Backup
 
-SetDefaultVariables() {
+SetDefaultVariables()
+{
 	backpath="/images/backup"
 	backname="sicherung"
 	wunschanzahl=20
 	mode="incremental"
 }
 
-ReadArguments() {
+ReadArguments()
+{
 	if [ -n "$1" ]; then
 		case "$1" in
 		"full")
@@ -23,7 +25,8 @@ ReadArguments() {
 	fi
 }
 
-CreateBackupFolder() {
+CreateBackupFolder()
+{
 	backDir="$(date +%Y-%m-%d)"_"$backname"
 	lastBackDir="$(date -d "1 Day ago" +%Y-%m-%d)"_"$backname"
 
@@ -36,17 +39,20 @@ CreateBackupFolder() {
 	fi
 }
 
-CreateBackupFolderRemotePC() {
+CreateBackupFolderRemotePC()
+{
 	mkdir --parents $backpath/$backDir/$remoterechner
 }
 
-GetHardLinkOpts() {
+GetHardLinkOpts()
+{
 	if [ "$mode" == "incremental" ]; then
 		hardlinkopt="--link-dest=$backpath/$lastBackDir/$remoterechner"
 	fi
 }
 
-printfStripLine() {
+printfStripLine()
+{
 	printf "####################"
 	printf "####################"
 	printf "####################"
@@ -57,7 +63,8 @@ printfStripLine() {
 # Backup VMs
 ################################################################################
 
-BackupVMDiscs() {
+BackupVMDiscs()
+{
 	local readonly Disks=$(ssh $remoteLogin virsh domblklist $VM --details \
 		| grep disk \
 		| awk '{print $4}')
@@ -92,13 +99,15 @@ BackupVMDiscs() {
 	done
 }
 
-WaitVMShutdown() {
+WaitVMShutdown()
+{
 	while [ "$(ssh $remoteLogin virsh list --name | grep $VM)" != "" ]; do
 		sleep 2;
 	done
 }
 
-BackupOnlineVMs() {
+BackupOnlineVMs()
+{
 	onlineVM=$(ssh $remoteLogin virsh list --name)
 
 	for VM in $onlineVM; do
@@ -113,7 +122,8 @@ BackupOnlineVMs() {
 	done
 }
 
-BackupOfflineVMs() {
+BackupOfflineVMs()
+{
 	offlineVM=$(ssh $remoteLogin virsh list --all \
 		| grep 'shut off' \
 		| awk '{print $2}')
@@ -126,14 +136,16 @@ BackupOfflineVMs() {
 	done
 }
 
-BackupVMs() {
+BackupVMs()
+{
 	BackupOnlineVMs
 	BackupOfflineVMs
 }
 
 ################################################################################
 
-BackupDirectoryPath() {
+BackupDirectoryPath()
+{
 	local readonly logFile="$backRemotePCPath/backup-$(echo $pfad \
 		| sed 's/\//-/g').log"
 
@@ -150,7 +162,8 @@ BackupDirectoryPath() {
 	printfStripLine
 }
 
-BackupPackages() {
+BackupPackages()
+{
 	local readonly packPath="$backRemotePCPath/packages"
 
 	printfStripLine
@@ -164,7 +177,8 @@ BackupPackages() {
 	printfStripLine
 }
 
-BackupPathes() {
+BackupPathes()
+{
 	for pfad in $(cat pfad-$remoterechner.txt); do
 		if [ "$pfad" == "virsh" ]; then
 			BackupVMs
@@ -176,7 +190,8 @@ BackupPathes() {
 	done
 }
 
-BackupRemotePC() {
+BackupRemotePC()
+{
 	remoteuser="root"
 
 	for remoterechner in $(cat rechner.txt); do
@@ -190,7 +205,8 @@ BackupRemotePC() {
 	done
 }
 
-CleanUpBackups() {
+CleanUpBackups()
+{
 	backupanzahl=$(ls --directory $backpath/*/ \
 		| grep "_$backname" \
 		| sort \
@@ -217,7 +233,8 @@ CleanUpBackups() {
 	fi
 }
 
-main() {
+main()
+{
 	SetDefaultVariables
 	ReadArguments
 
diff --git a/backup-einfach b/backup-einfach
index 370b8ae..4fface7 100755
--- a/backup-einfach
+++ b/backup-einfach
@@ -3,23 +3,27 @@
 ### auf verschiedenen Rechner und Syncronisiert das Backup
 
 # Informationen fuer den Sicherungsserver
-SetDefaultVariables() {
+SetDefaultVariables()
+{
 	backpath="/images/backup"
 	backDir="einfach-sicherung"
 }
 
-CreateBackupFolderRemotePC() {
+CreateBackupFolderRemotePC()
+{
 	mkdir --parents $backpath/$backDir/$remoterechner
 }
 
-printfStripLine() {
+printfStripLine()
+{
 	printf "####################"
 	printf "####################"
 	printf "####################"
 	printf "####################\n"
 }
 
-BackupPathes() {
+BackupPathes()
+{
 	local logFile=""
 
 	for pfad in $(cat pfad-$remoterechner.txt); do
@@ -40,7 +44,8 @@ BackupPathes() {
 	done
 }
 
-BackupRemotePC() {
+BackupRemotePC()
+{
 	remoteuser="root"
 
 	for remoterechner in $(cat rechner.txt); do
@@ -53,7 +58,8 @@ BackupRemotePC() {
 	done
 }
 
-main() {
+main()
+{
 	SetDefaultVariables
 	BackupRemotePC
 }
diff --git a/restore b/restore
index f755ccd..6e42314 100755
--- a/restore
+++ b/restore
@@ -1,11 +1,13 @@
 #!/bin/bash
 
-SetDefaultVariables() {
+SetDefaultVariables()
+{
 	backpath="/images/backup"
 	backname="sicherung"
 }
 
-ReadArguments() {
+ReadArguments()
+{
 	while getopts "d:r:p:" optname; do
 		case "$optname" in
 		"d")
@@ -26,14 +28,16 @@ ReadArguments() {
 	fi
 }
 
-printfStripLine() {
+printfStripLine()
+{
 	printf "####################"
 	printf "####################"
 	printf "####################"
 	printf "####################\n"
 }
 
-RestoreData() {
+RestoreData()
+{
 	remoteLogin="root@$rechner"
 	backDir="$datum"_"$backname"
 	fullPathBackPath="$backpath/$backDir"
@@ -54,12 +58,12 @@ RestoreData() {
 		$remoteLogin:$pfad
 }
 
-main() {
+main()
+{
 	SetDefaultVariables
 	ReadArguments $*
 	RestoreData
 }
 
 main $*
-
 exit 0
diff --git a/restore-einfach b/restore-einfach
index a2985ac..8fb73ea 100755
--- a/restore-einfach
+++ b/restore-einfach
@@ -1,11 +1,13 @@
 #!/bin/bash
 
-SetDefaultVariables() {
+SetDefaultVariables()
+{
 	backpath="/images/backup"
 	backDir="einfach-sicherung"
 }
 
-ReadArguments() {
+ReadArguments()
+{
 	while getopts "r:p:" optname; do
 		case "$optname" in
 		"r")
@@ -23,14 +25,16 @@ ReadArguments() {
 	fi
 }
 
-printfStripLine() {
+printfStripLine()
+{
 	printf "####################"
 	printf "####################"
 	printf "####################"
 	printf "####################\n"
 }
 
-RestoreData() {
+RestoreData()
+{
 	remoteLogin="root@$rechner"
 	fullPathBackPath="$backpath/$backDir"
 
@@ -49,7 +53,8 @@ RestoreData() {
 		$remoteLogin:$pfad
 }
 
-main() {
+main()
+{
 	SetDefaultVariables
 	ReadArguments $*
 	RestoreData