Skip to content

Commit 5a39cb3

Browse files
committed
- resolved bug in getcfg-replacement script with DOS-formatted-config-files (script handles "\r" correctly now)
1 parent e727cc2 commit 5a39cb3

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

CHANGES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ EDIT 1.1 - 22.04.2018: added server-, port- and searchfolders-configuration in c
66
EDIT 1.1 - 23.04.2018: added possibility to specify sharetype (smb:qnap or filesystem), configuration file to use can be passed as first parameter to script
77
EDIT 1.1 - 27.04.2018: added simple "emulation" getcfg command to support non-Qnap-systems and supress logging if /sbin/write_log-command isn't available
88
EDIT 1.1 - 28.04.2018: added some scripts to interact with docker infrastructure (create pgsqlbackup-image, execute pgsqlbackup-image)
9+
EDIT 1.2 - 29.04.2018: resolved bug in getcfg-replacement script with DOS-formatted-config-files (script handles "\r" correctly now)

docker/create_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Part of pgsqlbackup v1.1
3+
# Part of pgsqlbackup v1.2
44
#
55
# Copyright 2018 Patrick Morgenstern (ariaci)
66
#

docker/pgsqlbackup_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Part of pgsqlbackup v1.1
3+
# Part of pgsqlbackup v1.2
44
#
55
# Copyright 2018 Patrick Morgenstern (ariaci)
66
#

pgsqlbackup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# pgsqlbackup v1.1
3+
# pgsqlbackup v1.2
44
#
55
# Copyright 2017 Patrick Morgenstern (ariaci)
66
#

pgsqlbackup_getcfg.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Part of pgsqlbackup v1.1
3+
# Part of pgsqlbackup v1.2
44
#
55
# Copyright 2018 Patrick Morgenstern (ariaci)
66
#
@@ -20,4 +20,4 @@
2020
# This script only emulates the system-internal getcfg-command of Qnap devices
2121
#
2222

23-
/bin/sed -nr "/^\[$1\]/I { :l /^$2[ ]*=/I { s/.*=[ ]*//; p; q;}; n; b l;}" "$4"
23+
/bin/sed -nr "/^\[$1\]/I { :l /^$2[ ]*=/I { s/.*=[ ]*//; p; q;}; n; b l;}" "$4" | tr -d "\r"

0 commit comments

Comments
 (0)