Skip to content

Commit 18ba814

Browse files
fix: update installer asset/doc paths after UI/docs layout changes reported in #8
Remove stale installer references to removed top-level docs and update paths to match the current repository layout.
1 parent fcddea6 commit 18ba814

7 files changed

Lines changed: 15 additions & 57 deletions

install.cpanel.sh

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,14 @@ if [ -e "/usr/local/cpanel/3rdparty/bin/perl" ]; then
5151
fi
5252

5353
mkdir -v -m 0600 /etc/csf
54-
cp -avf install.txt /etc/csf/
5554

5655
echo
5756
echo "Checking Perl modules..."
5857
chmod 700 os.pl
5958
RETURN=`./os.pl`
6059
if [ "$RETURN" = 1 ]; then
6160
echo
62-
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See /etc/csf/install.txt for installation details."
61+
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See the README at https://github.com/Black-HOST/csf for installation details."
6362
exit
6463
else
6564
echo "...Perl modules OK"
@@ -360,12 +359,10 @@ chcon -h system_u:object_r:bin_t:s0 /usr/sbin/lfd
360359
chcon -h system_u:object_r:bin_t:s0 /usr/sbin/csf
361360

362361
mkdir panels/webmin/csf/images
363-
mkdir ui/images
364362
mkdir panels/da/images
365363
mkdir panels/interworx/images
366364

367365
cp -avf csf/* panels/webmin/csf/images/
368-
cp -avf csf/* ui/images/
369366
cp -avf csf/* panels/da/images/
370367
cp -avf csf/* panels/interworx/images/
371368

@@ -374,15 +371,12 @@ cp -avf csf/csf_small.png /usr/local/cpanel/whostmgr/docroot/addon_plugins/
374371
cp -avf uninstall.sh /usr/local/csf/bin/
375372
cp -avf csftest.pl /usr/local/csf/bin/
376373
cp -avf remove_apf_bfd.sh /usr/local/csf/bin/
377-
cp -avf readme.txt /etc/csf/
378374
cp -avf conf/sanity.txt /usr/local/csf/lib/sanity.txt
379375
cp -avf csf.rbls /usr/local/csf/lib/
380376
cp -avf restricted.txt /usr/local/csf/lib/
381-
cp -avf changelog.txt /etc/csf/
382377
cp -avf downloadservers /etc/csf/
383-
cp -avf install.txt /etc/csf/
384378
cp -avf version.txt /etc/csf/
385-
cp -avf license.txt /etc/csf/
379+
cp -avf LICENSE /etc/csf/
386380
cp -avf panels/webmin /usr/local/csf/lib/
387381
cp -avf lib/* /usr/local/csf/lib/
388382
cp -avf conf/ui/images /etc/csf/ui/.
@@ -436,7 +430,7 @@ chmod -v 700 /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf.cgi
436430

437431
cp -avf csf/ /usr/local/cpanel/whostmgr/docroot/cgi/configserver/
438432
cp -avf panels/cpanel/Driver /usr/local/cpanel/whostmgr/docroot/cgi/configserver/csf/
439-
cp -avf ui/images/icon.gif /usr/local/cpanel/whostmgr/docroot/themes/x/icons/csf.gif
433+
cp -avf conf/ui/images/icon.gif /usr/local/cpanel/whostmgr/docroot/themes/x/icons/csf.gif
440434
cp -avf panels/cpanel/csf.tmpl /usr/local/cpanel/whostmgr/docroot/templates/
441435

442436
VERSION=`cat /usr/local/cpanel/version | cut -d '.' -f2`

install.cwp.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,13 @@ fi
4444
echo
4545

4646
mkdir -v -m 0600 /etc/csf
47-
cp -avf install.txt /etc/csf/
4847

4948
echo "Checking Perl modules..."
5049
chmod 700 os.pl
5150
RETURN=`./os.pl`
5251
if [ "$RETURN" = 1 ]; then
5352
echo
54-
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See /etc/csf/install.txt for installation details."
53+
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See the README at https://github.com/Black-HOST/csf for installation details."
5554
echo
5655
exit
5756
else
@@ -368,28 +367,23 @@ chcon -h system_u:object_r:bin_t:s0 /usr/sbin/lfd
368367
chcon -h system_u:object_r:bin_t:s0 /usr/sbin/csf
369368

370369
mkdir panels/webmin/csf/images
371-
mkdir ui/images
372370
mkdir panels/da/images
373371
mkdir panels/interworx/images
374372

375373
cp -avf csf/* panels/webmin/csf/images/
376-
cp -avf csf/* ui/images/
377374
cp -avf csf/* panels/da/images/
378375
cp -avf csf/* panels/interworx/images/
379376

380377
cp -avf messenger/*.php /etc/csf/messenger/
381378
cp -avf uninstall.sh /usr/local/csf/bin/
382379
cp -avf csftest.pl /usr/local/csf/bin/
383380
cp -avf remove_apf_bfd.sh /usr/local/csf/bin/
384-
cp -avf readme.txt /etc/csf/
385381
cp -avf conf/sanity.txt /usr/local/csf/lib/sanity.txt
386382
cp -avf csf.rbls /usr/local/csf/lib/
387383
cp -avf restricted.txt /usr/local/csf/lib/
388-
cp -avf changelog.txt /etc/csf/
389384
cp -avf downloadservers /etc/csf/
390-
cp -avf install.txt /etc/csf/
391385
cp -avf version.txt /etc/csf/
392-
cp -avf license.txt /etc/csf/
386+
cp -avf LICENSE /etc/csf/
393387
cp -avf panels/webmin /usr/local/csf/lib/
394388
cp -avf lib/* /usr/local/csf/lib/
395389
cp -avf conf/ui/images /etc/csf/ui/.

install.cyberpanel.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,13 @@ fi
4444
echo
4545

4646
mkdir -v -m 0600 /etc/csf
47-
cp -avf install.txt /etc/csf/
4847

4948
echo "Checking Perl modules..."
5049
chmod 700 os.pl
5150
RETURN=`./os.pl`
5251
if [ "$RETURN" = 1 ]; then
5352
echo
54-
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See /etc/csf/install.txt for installation details."
53+
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See the README at https://github.com/Black-HOST/csf for installation details."
5554
echo
5655
exit
5756
else
@@ -368,28 +367,23 @@ chcon -h system_u:object_r:bin_t:s0 /usr/sbin/lfd
368367
chcon -h system_u:object_r:bin_t:s0 /usr/sbin/csf
369368

370369
mkdir panels/webmin/csf/images
371-
mkdir ui/images
372370
mkdir panels/da/images
373371
mkdir panels/interworx/images
374372

375373
cp -avf csf/* panels/webmin/csf/images/
376-
cp -avf csf/* ui/images/
377374
cp -avf csf/* panels/da/images/
378375
cp -avf csf/* panels/interworx/images/
379376

380377
cp -avf messenger/*.php /etc/csf/messenger/
381378
cp -avf uninstall.sh /usr/local/csf/bin/
382379
cp -avf csftest.pl /usr/local/csf/bin/
383380
cp -avf remove_apf_bfd.sh /usr/local/csf/bin/
384-
cp -avf readme.txt /etc/csf/
385381
cp -avf conf/sanity.txt /usr/local/csf/lib/sanity.txt
386382
cp -avf csf.rbls /usr/local/csf/lib/
387383
cp -avf restricted.txt /usr/local/csf/lib/
388-
cp -avf changelog.txt /etc/csf/
389384
cp -avf downloadservers /etc/csf/
390-
cp -avf install.txt /etc/csf/
391385
cp -avf version.txt /etc/csf/
392-
cp -avf license.txt /etc/csf/
386+
cp -avf LICENSE /etc/csf/
393387
cp -avf panels/webmin /usr/local/csf/lib/
394388
cp -avf lib/* /usr/local/csf/lib/
395389
cp -avf conf/ui/images /etc/csf/ui/.

install.directadmin.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@ fi
3232
echo
3333

3434
mkdir -v -m 0600 /etc/csf
35-
cp -avf install.txt /etc/csf/
3635

3736
echo "Checking Perl modules..."
3837
chmod 700 os.pl
3938
RETURN=`./os.pl`
4039
if [ "$RETURN" = 1 ]; then
4140
echo
42-
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See /etc/csf/install.txt for installation details."
41+
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See the README at https://github.com/Black-HOST/csf for installation details."
4342
echo
4443
exit
4544
else
@@ -355,28 +354,23 @@ chcon -h system_u:object_r:bin_t:s0 /usr/sbin/lfd
355354
chcon -h system_u:object_r:bin_t:s0 /usr/sbin/csf
356355

357356
mkdir panels/webmin/csf/images
358-
mkdir ui/images
359357
mkdir panels/da/images
360358
mkdir panels/interworx/images
361359

362360
cp -avf csf/* panels/webmin/csf/images/
363-
cp -avf csf/* ui/images/
364361
cp -avf csf/* panels/da/images/
365362
cp -avf csf/* panels/interworx/images/
366363

367364
cp -avf messenger/*.php /etc/csf/messenger/
368365
cp -avf uninstall.sh /usr/local/csf/bin/
369366
cp -avf csftest.pl /usr/local/csf/bin/
370367
cp -avf remove_apf_bfd.sh /usr/local/csf/bin/
371-
cp -avf readme.txt /etc/csf/
372368
cp -avf conf/sanity.txt /usr/local/csf/lib/sanity.txt
373369
cp -avf csf.rbls /usr/local/csf/lib/
374370
cp -avf restricted.txt /usr/local/csf/lib/
375-
cp -avf changelog.txt /etc/csf/
376371
cp -avf downloadservers /etc/csf/
377-
cp -avf install.txt /etc/csf/
378372
cp -avf version.txt /etc/csf/
379-
cp -avf license.txt /etc/csf/
373+
cp -avf LICENSE /etc/csf/
380374
cp -avf panels/webmin /usr/local/csf/lib/
381375
cp -avf lib/* /usr/local/csf/lib/
382376
cp -avf conf/ui/images /etc/csf/ui/.

install.generic.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,13 @@ fi
4444
echo
4545

4646
mkdir -v -m 0600 /etc/csf
47-
cp -avf install.txt /etc/csf/
4847

4948
echo "Checking Perl modules..."
5049
chmod 700 os.pl
5150
RETURN=`./os.pl`
5251
if [ "$RETURN" = 1 ]; then
5352
echo
54-
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See /etc/csf/install.txt for installation details."
53+
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See the README at https://github.com/Black-HOST/csf for installation details."
5554
echo
5655
exit
5756
else
@@ -368,28 +367,23 @@ chcon -h system_u:object_r:bin_t:s0 /usr/sbin/lfd
368367
chcon -h system_u:object_r:bin_t:s0 /usr/sbin/csf
369368

370369
mkdir panels/webmin/csf/images
371-
mkdir ui/images
372370
mkdir panels/da/images
373371
mkdir panels/interworx/images
374372

375373
cp -avf csf/* panels/webmin/csf/images/
376-
cp -avf csf/* ui/images/
377374
cp -avf csf/* panels/da/images/
378375
cp -avf csf/* panels/interworx/images/
379376

380377
cp -avf messenger/*.php /etc/csf/messenger/
381378
cp -avf uninstall.sh /usr/local/csf/bin/
382379
cp -avf csftest.pl /usr/local/csf/bin/
383380
cp -avf remove_apf_bfd.sh /usr/local/csf/bin/
384-
cp -avf readme.txt /etc/csf/
385381
cp -avf conf/sanity.txt /usr/local/csf/lib/sanity.txt
386382
cp -avf csf.rbls /usr/local/csf/lib/
387383
cp -avf restricted.txt /usr/local/csf/lib/
388-
cp -avf changelog.txt /etc/csf/
389384
cp -avf downloadservers /etc/csf/
390-
cp -avf install.txt /etc/csf/
391385
cp -avf version.txt /etc/csf/
392-
cp -avf license.txt /etc/csf/
386+
cp -avf LICENSE /etc/csf/
393387
cp -avf panels/webmin /usr/local/csf/lib/
394388
cp -avf lib/* /usr/local/csf/lib/
395389
cp -avf conf/ui/images /etc/csf/ui/.

install.interworx.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,13 @@ fi
4444
echo
4545

4646
mkdir -v -m 0600 /etc/csf
47-
cp -avf install.txt /etc/csf/
4847

4948
echo "Checking Perl modules..."
5049
chmod 700 os.pl
5150
RETURN=`./os.pl`
5251
if [ "$RETURN" = 1 ]; then
5352
echo
54-
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See /etc/csf/install.txt for installation details."
53+
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See the README at https://github.com/Black-HOST/csf for installation details."
5554
echo
5655
exit
5756
else
@@ -368,28 +367,23 @@ chcon -h system_u:object_r:bin_t:s0 /usr/sbin/lfd
368367
chcon -h system_u:object_r:bin_t:s0 /usr/sbin/csf
369368

370369
mkdir panels/webmin/csf/images
371-
mkdir ui/images
372370
mkdir panels/da/images
373371
mkdir panels/interworx/images
374372

375373
cp -avf csf/* panels/webmin/csf/images/
376-
cp -avf csf/* ui/images/
377374
cp -avf csf/* panels/da/images/
378375
cp -avf csf/* panels/interworx/images/
379376

380377
cp -avf messenger/*.php /etc/csf/messenger/
381378
cp -avf uninstall.sh /usr/local/csf/bin/
382379
cp -avf csftest.pl /usr/local/csf/bin/
383380
cp -avf remove_apf_bfd.sh /usr/local/csf/bin/
384-
cp -avf readme.txt /etc/csf/
385381
cp -avf conf/sanity.txt /usr/local/csf/lib/sanity.txt
386382
cp -avf csf.rbls /usr/local/csf/lib/
387383
cp -avf restricted.txt /usr/local/csf/lib/
388-
cp -avf changelog.txt /etc/csf/
389384
cp -avf downloadservers /etc/csf/
390-
cp -avf install.txt /etc/csf/
391385
cp -avf version.txt /etc/csf/
392-
cp -avf license.txt /etc/csf/
386+
cp -avf LICENSE /etc/csf/
393387
cp -avf panels/webmin /usr/local/csf/lib/
394388
cp -avf lib/* /usr/local/csf/lib/
395389
cp -avf conf/ui/images /etc/csf/ui/.

install.vesta.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,13 @@ fi
4444
echo
4545

4646
mkdir -v -m 0600 /etc/csf
47-
cp -avf install.txt /etc/csf/
4847

4948
echo "Checking Perl modules..."
5049
chmod 700 os.pl
5150
RETURN=`./os.pl`
5251
if [ "$RETURN" = 1 ]; then
5352
echo
54-
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See /etc/csf/install.txt for installation details."
53+
echo "FAILED: You MUST install the missing perl modules above before you can install csf. See the README at https://github.com/Black-HOST/csf for installation details."
5554
echo
5655
exit
5756
else
@@ -368,28 +367,23 @@ chcon -h system_u:object_r:bin_t:s0 /usr/sbin/lfd
368367
chcon -h system_u:object_r:bin_t:s0 /usr/sbin/csf
369368

370369
mkdir panels/webmin/csf/images
371-
mkdir ui/images
372370
mkdir panels/da/images
373371
mkdir panels/interworx/images
374372

375373
cp -avf csf/* panels/webmin/csf/images/
376-
cp -avf csf/* ui/images/
377374
cp -avf csf/* panels/da/images/
378375
cp -avf csf/* panels/interworx/images/
379376

380377
cp -avf messenger/*.php /etc/csf/messenger/
381378
cp -avf uninstall.sh /usr/local/csf/bin/
382379
cp -avf csftest.pl /usr/local/csf/bin/
383380
cp -avf remove_apf_bfd.sh /usr/local/csf/bin/
384-
cp -avf readme.txt /etc/csf/
385381
cp -avf conf/sanity.txt /usr/local/csf/lib/sanity.txt
386382
cp -avf csf.rbls /usr/local/csf/lib/
387383
cp -avf restricted.txt /usr/local/csf/lib/
388-
cp -avf changelog.txt /etc/csf/
389384
cp -avf downloadservers /etc/csf/
390-
cp -avf install.txt /etc/csf/
391385
cp -avf version.txt /etc/csf/
392-
cp -avf license.txt /etc/csf/
386+
cp -avf LICENSE /etc/csf/
393387
cp -avf panels/webmin /usr/local/csf/lib/
394388
cp -avf lib/* /usr/local/csf/lib/
395389
cp -avf conf/ui/images /etc/csf/ui/.

0 commit comments

Comments
 (0)