Skip to content

Commit a566549

Browse files
deajandeajan
committed
Rebuilt targets
1 parent bc1878b commit a566549

File tree

3 files changed

+27
-36
lines changed

3 files changed

+27
-36
lines changed

‎dev/debug_osync.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ else
9090
_LOGGER_VERBOSE=true
9191
fi
9292

93-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
93+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
9494
SLEEP_TIME=.05
9595
fi
9696

@@ -776,7 +776,7 @@ function _PerfProfiler { #__WITH_PARANOIA_DEBUG
776776

777777
_OFUNCTIONS_SPINNER="|/-\\"
778778
function Spinner {
779-
if [ $_LOGGER_SILENT == true ] || [ "$_LOGGER_ERR_ONLY" == true ] || [ "$_SYNC_ON_CHANGES" == "initiator" ] || [ "$_SYNC_ON_CHANGES" == "target" ] ; then
779+
if [ "$_LOGGER_SILENT" == true ] || [ "$_LOGGER_ERR_ONLY" == true ] || [ "$_SYNC_ON_CHANGES" == "initiator" ] || [ "$_SYNC_ON_CHANGES" == "target" ] ; then
780780
return 0
781781
else
782782
printf " [%c] \b\b\b\b\b\b" "$_OFUNCTIONS_SPINNER"
@@ -2993,7 +2993,7 @@ else
29932993
_LOGGER_VERBOSE=true
29942994
fi
29952995
2996-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
2996+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
29972997
SLEEP_TIME=.05
29982998
fi
29992999
function TrapError {
@@ -3434,7 +3434,7 @@ else
34343434
_LOGGER_VERBOSE=true
34353435
fi
34363436
3437-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
3437+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
34383438
SLEEP_TIME=.05
34393439
fi
34403440
function TrapError {
@@ -4055,7 +4055,7 @@ else
40554055
_LOGGER_VERBOSE=true
40564056
fi
40574057
4058-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
4058+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
40594059
SLEEP_TIME=.05
40604060
fi
40614061
function TrapError {
@@ -4754,7 +4754,7 @@ else
47544754
_LOGGER_VERBOSE=true
47554755
fi
47564756
4757-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
4757+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
47584758
SLEEP_TIME=.05
47594759
fi
47604760
function TrapError {
@@ -5712,7 +5712,7 @@ else
57125712
_LOGGER_VERBOSE=true
57135713
fi
57145714
5715-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
5715+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
57165716
SLEEP_TIME=.05
57175717
fi
57185718
function TrapError {
@@ -6049,7 +6049,7 @@ else
60496049
_LOGGER_VERBOSE=true
60506050
fi
60516051
6052-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
6052+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
60536053
SLEEP_TIME=.05
60546054
fi
60556055
function TrapError {

‎install.sh‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ else
6161
_LOGGER_VERBOSE=true
6262
fi
6363

64-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
64+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
6565
SLEEP_TIME=.05
6666
fi
6767

@@ -834,7 +834,7 @@ function CopyServiceFiles {
834834

835835

836836
Logger "Created [$SERVICE_NAME] service in [$SERVICE_DIR_SYSTEMD_SYSTEM] and [$SERVICE_DIR_SYSTEMD_USER]." "NOTICE"
837-
Logger "Can be activated with [systemctl start $SERVICE_NAME@instance.conf] where instance.conf is the name of the config file in $CONF_DIR." "NOTICE"
837+
Logger "Can be activated with [systemctl start [email protected]] where instance.conf is the name of the config file in $CONF_DIR." "NOTICE"
838838
Logger "Can be enabled on boot with [systemctl enable $SERVICE_NAME@instance.conf]." "NOTICE"
839839
Logger "In userland, active with [systemctl --user start $SERVICE_NAME@instance.conf]." "NOTICE"
840840
elif ([ "$init" == "initV" ] && [ -f "$SCRIPT_PATH/$SERVICE_FILE_INIT" ] && [ -d "$SERVICE_DIR_INIT" ]); then
@@ -907,31 +907,22 @@ function RemoveAll {
907907
else
908908
Logger "Skipping removal of [$BIN_DIR/$SSH_FILTER] because other programs present that need it." "NOTICE"
909909
fi
910+
RemoveFile "$SERVICE_DIR_SYSTEMD_SYSTEM/$SERVICE_FILE_SYSTEMD_SYSTEM"
911+
RemoveFile "$SERVICE_DIR_SYSTEMD_USER/$SERVICE_FILE_SYSTEMD_USER"
912+
RemoveFile "$SERVICE_DIR_INIT/$SERVICE_FILE_INIT"
910913

911-
# Try to uninstall every possible service file
912-
#if [ $init == "systemd" ]; then
913-
RemoveFile "$SERVICE_DIR_SYSTEMD_SYSTEM/$SERVICE_FILE_SYSTEMD_SYSTEM"
914-
RemoveFile "$SERVICE_DIR_SYSTEMD_USER/$SERVICE_FILE_SYSTEMD_USER"
915-
RemoveFile "$SERVICE_DIR_SYSTEMD_SYSTEM/$TARGET_HELPER_SERVICE_FILE_SYSTEMD_SYSTEM"
916-
RemoveFile "$SERVICE_DIR_SYSTEMD_USER/$TARGET_HELPER_SERVICE_FILE_SYSTEMD_USER"
917-
#elif [ $init == "initV" ]; then
918-
RemoveFile "$SERVICE_DIR_INIT/$SERVICE_FILE_INIT"
919-
RemoveFile "$SERVICE_DIR_INIT/$TARGET_HELPER_SERVICE_FILE_INIT"
920-
#elif [ $init == "openrc" ]; then
921-
RemoveFile "$SERVICE_DIR_OPENRC/$SERVICE_FILE_OPENRC"
922-
RemoveFile "$SERVICE_DIR_OPENRC/$TARGET_HELPER_SERVICE_FILE_OPENRC"
923-
#else
924-
#Logger "Can't uninstall from initV, systemd or openRC." "WARN"
925-
#fi
914+
RemoveFile "$TARGET_HELPER_SERVICE_DIR_SYSTEMD_SYSTEM/$SERVICE_FILE_SYSTEMD_SYSTEM"
915+
RemoveFile "$TARGET_HELPER_SERVICE_DIR_SYSTEMD_USER/$SERVICE_FILE_SYSTEMD_USER"
916+
RemoveFile "$TARGET_HELPER_SERVICE_DIR_INIT/$SERVICE_FILE_INIT"
926917

927918
Logger "Skipping configuration files in [$CONF_DIR]. You may remove this directory manually." "NOTICE"
928919
}
929920

930921
function Usage {
931922
echo "Installs $PROGRAM into $BIN_DIR"
932923
echo "options:"
933-
echo "--silent Will log and bypass user interaction."
934-
echo "--no-stats Used with --silent in order to refuse sending anonymous install stats."
924+
echo "--silent Will log and bypass user interaction."
925+
echo "--no-stats Used with --silent in order to refuse sending anonymous install stats."
935926
echo "--remove Remove the program."
936927
echo "--prefix=/path Use prefix to install path."
937928
exit 127

‎osync.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ else
5757
_LOGGER_VERBOSE=true
5858
fi
5959

60-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
60+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
6161
SLEEP_TIME=.05
6262
fi
6363

@@ -458,7 +458,7 @@ function SendAlert {
458458
fi
459459

460460
if [ $runAlert == true ]; then
461-
subject="Currently runing - $subject"
461+
subject="Currently running - $subject"
462462
else
463463
subject="Finished run - $subject"
464464
fi
@@ -712,7 +712,7 @@ function LoadConfigFile {
712712

713713
_OFUNCTIONS_SPINNER="|/-\\"
714714
function Spinner {
715-
if [ $_LOGGER_SILENT == true ] || [ "$_LOGGER_ERR_ONLY" == true ] || [ "$_SYNC_ON_CHANGES" == "initiator" ] || [ "$_SYNC_ON_CHANGES" == "target" ] ; then
715+
if [ "$_LOGGER_SILENT" == true ] || [ "$_LOGGER_ERR_ONLY" == true ] || [ "$_SYNC_ON_CHANGES" == "initiator" ] || [ "$_SYNC_ON_CHANGES" == "target" ] ; then
716716
return 0
717717
else
718718
printf " [%c] \b\b\b\b\b\b" "$_OFUNCTIONS_SPINNER"
@@ -2834,7 +2834,7 @@ else
28342834
_LOGGER_VERBOSE=true
28352835
fi
28362836
2837-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
2837+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
28382838
SLEEP_TIME=.05
28392839
fi
28402840
function TrapError {
@@ -3263,7 +3263,7 @@ else
32633263
_LOGGER_VERBOSE=true
32643264
fi
32653265
3266-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
3266+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
32673267
SLEEP_TIME=.05
32683268
fi
32693269
function TrapError {
@@ -3867,7 +3867,7 @@ else
38673867
_LOGGER_VERBOSE=true
38683868
fi
38693869
3870-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
3870+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
38713871
SLEEP_TIME=.05
38723872
fi
38733873
function TrapError {
@@ -4551,7 +4551,7 @@ else
45514551
_LOGGER_VERBOSE=true
45524552
fi
45534553
4554-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
4554+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
45554555
SLEEP_TIME=.05
45564556
fi
45574557
function TrapError {
@@ -5495,7 +5495,7 @@ else
54955495
_LOGGER_VERBOSE=true
54965496
fi
54975497
5498-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
5498+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
54995499
SLEEP_TIME=.05
55005500
fi
55015501
function TrapError {
@@ -5820,7 +5820,7 @@ else
58205820
_LOGGER_VERBOSE=true
58215821
fi
58225822
5823-
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibity to set SLEEP_TIME as environment variable when runinng with bash -x in order to avoid spamming console
5823+
if [ "$SLEEP_TIME" == "" ]; then # Leave the possibility to set SLEEP_TIME as environment variable when running with bash -x in order to avoid spamming console
58245824
SLEEP_TIME=.05
58255825
fi
58265826
function TrapError {

0 commit comments

Comments
 (0)