samply/bridgehead
1
0
Fork 0
mirror of https://github.com/samply/bridgehead.git synced 2025-06-17 03:40:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Patrick Skowronek
2022-07-19 14:18:48 +02:00
parent ef7b96372b
commit 8c982c939e
5 changed files with 5 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/functions.sh
View File

@ -2,20 +2,11 @@
exitIfNotRoot() {
if [ "$EUID" -ne 0 ]; then
<<<<<<< HEAD
echo "Please run as root"
=======
log "ERROR" "Please run as root"
>>>>>>> version-1
exit 1
fi
}
<<<<<<< HEAD
log() {
echo "$(date +'%Y-%m-%d %T')" "$1:" "$2"
}
=======
checkOwner(){
COUNT=$(find $1 ! -user $2 |wc -l)
if [ $COUNT -gt 0 ]; then
@ -113,4 +104,3 @@ export PRODUCTION="false";
if [ "$(git branch --show-current)" == "main" ]; then
export PRODUCTION="true";
fi
>>>>>>> version-1