Skip to content

Commit 77b8696

Browse files
committed
Remove init script
Fix issue while resuming downloads Move script to `/usr/bin` Coding style
1 parent 0203f2d commit 77b8696

8 files changed

+244
-212
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ before_install:
88

99
install:
1010
- sudo mkdir -p /opt/ftpgrab/conf /var/log/ftpgrab /var/run/ftpgrab
11-
- sudo cp ftpgrab.sh /etc/init.d/ftpgrab
12-
- sudo chmod +x /etc/init.d/ftpgrab
13-
- sudo chown $USER /etc/init.d/ftpgrab
11+
- sudo cp ftpgrab.sh /usr/bin/ftpgrab
12+
- sudo chmod +x /usr/bin/ftpgrab
13+
- sudo chown $USER /usr/bin/ftpgrab
1414
- sudo cp ftpgrab.conf /opt/ftpgrab/
1515
- sudo chown -R $USER /opt/ftpgrab/ /var/log/ftpgrab/ /var/run/ftpgrab/
1616

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## 4.1.2 (2017/10/15)
4+
5+
* Remove init script
6+
* Fix issue while resuming downloads
7+
* Move script to `/usr/bin`
8+
* Coding style
9+
310
## 4.1.1 (2017/04/26)
411

512
* Add tests (Issue #30)

UPGRADE.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## 4.1 > 4.2.0
2+
3+
```console
4+
$ mv /etc/init.d/ftpgrab /usr/bin/
5+
$ update-rc.d ftpgrab remove
6+
```
7+
8+
If you have a cron, do not forget to change it :
9+
10+
```
11+
0 4 * * * ftpgrab seedbox.conf >/dev/null 2>&1
12+
```
13+
114
## 4.0 > 4.1
215

316
Since the project has been renamed `ftpgrab`, some changes has to be made.

ftpgrab.sh

+217-205
Large diffs are not rendered by default.

tests/test01_wget_md5_text.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ sed "s#FTP_USER=\"\"#FTP_USER=\"$SERVER1_USER\"#" -i "$CONFIG_FILE"
2020
sed "s#FTP_PASSWORD=\"\"#FTP_PASSWORD=\"$SERVER1_PASSWORD\"#" -i "$CONFIG_FILE"
2121

2222
# Launch
23-
/etc/init.d/ftpgrab "$TEST_NAME.conf"
23+
ftpgrab "$TEST_NAME.conf"

tests/test02_wget_sha1_text.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ sed "s#FTP_PASSWORD=\"\"#FTP_PASSWORD=\"$SERVER1_PASSWORD\"#" -i "$CONFIG_FILE"
2121
sed "s#HASH_TYPE=\"$DEFAULT_HASH_TYPE\"#HASH_TYPE=\"sha1\"#" -i "$CONFIG_FILE"
2222

2323
# Launch
24-
/etc/init.d/ftpgrab "$TEST_NAME.conf"
24+
ftpgrab "$TEST_NAME.conf"

tests/test03_curl_md5_sqlite3.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ sed "s#DL_METHOD=\"$DEFAULT_DL_METHOD\"#DL_METHOD=\"curl\"#" -i "$CONFIG_FILE"
2222
sed "s#HASH_STORAGE=\"$DEFAULT_HASH_STORAGE\"#HASH_TYPE=\"sqlite3\"#" -i "$CONFIG_FILE"
2323

2424
# Launch
25-
/etc/init.d/ftpgrab "$TEST_NAME.conf"
25+
ftpgrab "$TEST_NAME.conf"

tests/test04_curl_sha1_sqlite3_secure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ sed "s#HASH_TYPE=\"$DEFAULT_HASH_TYPE\"#HASH_TYPE=\"sha1\"#" -i "$CONFIG_FILE"
2424
sed "s#HASH_STORAGE=\"$DEFAULT_HASH_STORAGE\"#HASH_TYPE=\"sqlite3\"#" -i "$CONFIG_FILE"
2525

2626
# Launch
27-
/etc/init.d/ftpgrab "$TEST_NAME.conf"
27+
ftpgrab "$TEST_NAME.conf"

0 commit comments

Comments
 (0)