WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unnecessary code

This commit is contained in:
deajan 2016-12-08 08:56:35 +01:00
parent c8e2c4e438
commit 80cf34cedd
1 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dev/merge.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
## MERGE 2016120701 ## MERGE 2016120801
## Merges ofunctions.sh and n_program.sh into program.sh ## Merges ofunctions.sh and n_program.sh into program.sh
## Adds installer ## Adds installer
@ -24,11 +24,6 @@ function __PREPROCESSOR_Merge {
__PREPROCESSOR_MergeSubset "$subset" "${subset//SUBSET/SUBSET END}" "ofunctions.sh" "debug_$PROGRAM.sh" __PREPROCESSOR_MergeSubset "$subset" "${subset//SUBSET/SUBSET END}" "ofunctions.sh" "debug_$PROGRAM.sh"
done done
#if [ "$PROGRAM" == "osync" ] || [ "$PROGRAM" == "obackup" ]; then
# MergeAll
#else
# MergeMinimum
#fi
__PREPROCESSOR_CleanDebug __PREPROCESSOR_CleanDebug
__PREPROCESSOR_CopyCommons __PREPROCESSOR_CopyCommons
rm -f tmp_$PROGRAM.sh rm -f tmp_$PROGRAM.sh
@ -66,40 +61,6 @@ function __PREPROCESSOR_Unexpand {
fi fi
} }
function __PREPROCESSOR_MergeAll {
sed "/source \"\.\/ofunctions.sh\"/r ofunctions.sh" tmp_$PROGRAM.sh | grep -v 'source "./ofunctions.sh"' > debug_$PROGRAM.sh
if [ $? != 0 ]; then
QuickLogger "Cannot sed ofunctions" "stderr"
exit 1
fi
}
function __PREPROCESSOR_MergeMinimum {
sed -n "/$MINIMUM_FUNCTION_BEGIN/,/$MINIMUM_FUNCTION_END/p" ofunctions.sh > tmp_minimal.sh
if [ $? != 0 ]; then
QuickLogger "Cannot sed minimum functions." "stderr"
exit 1
fi
sed "/source \"\.\/ofunctions.sh\"/r tmp_minimal.sh" tmp_$PROGRAM.sh | grep -v 'source "./ofunctions.sh"' | grep -v "$PARANOIA_DEBUG_LINE" > debug_$PROGRAM.sh
if [ $? != 0 ]; then
QuickLogger "Cannot remove PARANOIA_DEBUG code from tmp_minimum." "stderr"
exit 1
fi
rm -f tmp_minimal.sh
if [ $? != 0 ]; then
QuickLogger "Cannot remove tmp_minimal.sh" "stderr"
exit 1
fi
chmod +x debug_$PROGRAM.sh
if [ $? != 0 ]; then
QuickLogger "Cannot chmod debug_$PROGRAM.sh" "stderr"
exit 1
fi
}
function __PREPROCESSOR_MergeSubset { function __PREPROCESSOR_MergeSubset {
local subsetBegin="${1}" local subsetBegin="${1}"
local subsetEnd="${2}" local subsetEnd="${2}"
@ -116,7 +77,7 @@ function __PREPROCESSOR_MergeSubset {
QuickLogger "Cannot add subset [$subsetBegin] to [$mergedFile]." "stderr" QuickLogger "Cannot add subset [$subsetBegin] to [$mergedFile]." "stderr"
exit 1 exit 1
fi fi
rm -f "$subsetFile.$subsetBegin" #rm -f "$subsetFile.$subsetBegin"
if [ $? != 0 ]; then if [ $? != 0 ]; then
QuickLogger "Cannot remove temporary subset [$subsetFile.$subsetBeign]." "stderr" QuickLogger "Cannot remove temporary subset [$subsetFile.$subsetBeign]." "stderr"
exit 1 exit 1