change: Method Klammern Konvention

diff --git a/backup b/backup
index a4f36cabd9334b0dddaad406073ce53ffbade94c..a45fc337293592e4d01766e0c8d0864116ed310f 100755 (executable)
--- 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 370b8aebeb8aba8e3da5cb6eec376c651a8ee2b5..4fface7af2c3f813b49a3b39d4c81fcd83821e8b 100755 (executable)
--- 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 f755ccde0f5a6f940d2a0f302b21db3dedf86ef3..6e42314eb035fb0dc585a2c240bc3627bf1ff60d 100755 (executable)
--- 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 a2985acae196710175d319f8b02f234e6e4a9e81..8fb73ea4aaac5f1944642454d132ec6c057a257b 100755 (executable)
--- 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