From 2ac43eabb2ded384c438a8bc25dd25025937b933 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 17 Jun 2017 18:37:06 +0100 Subject: [PATCH] Copying with hidden files --- src/freedombone-app-cryptpad | 2 +- src/freedombone-app-dokuwiki | 2 +- src/freedombone-app-etherpad | 2 +- src/freedombone-app-friendica | 2 +- src/freedombone-app-gnusocial | 6 +++--- src/freedombone-app-htmly | 2 +- src/freedombone-app-hubzilla | 4 ++-- src/freedombone-app-koel | 2 +- src/freedombone-app-librevault | 2 +- src/freedombone-app-lychee | 2 +- src/freedombone-app-mailpile | 2 +- src/freedombone-app-matrix | 2 +- src/freedombone-app-mediagoblin | 2 +- src/freedombone-app-movim | 2 +- src/freedombone-app-nextcloud | 2 +- src/freedombone-app-pihole | 2 +- src/freedombone-app-postactiv | 2 +- src/freedombone-app-profanity | 6 +++--- src/freedombone-app-rss | 4 ++-- src/freedombone-app-searx | 2 +- src/freedombone-app-tox | 10 +++++----- src/freedombone-app-turtl | 2 +- src/freedombone-app-zeronet | 2 +- src/freedombone-image-customise | 2 +- src/freedombone-utils-cmake | 4 ++-- src/freedombone-utils-filesystem | 4 ++-- src/freedombone-utils-gnusocialtools | 4 ++-- src/freedombone-utils-web | 2 +- 28 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/freedombone-app-cryptpad b/src/freedombone-app-cryptpad index 2f48ecfe..aa36c575 100755 --- a/src/freedombone-app-cryptpad +++ b/src/freedombone-app-cryptpad @@ -193,7 +193,7 @@ function install_cryptpad_main { if [ -d /repos/cryptpad ]; then mkdir $CRYPTPAD_DIR - cp -r -p /repos/cryptpad/* $CRYPTPAD_DIR + cp -r -p /repos/cryptpad/. $CRYPTPAD_DIR cd $CRYPTPAD_DIR git pull else diff --git a/src/freedombone-app-dokuwiki b/src/freedombone-app-dokuwiki index 66c4fc2b..f7b5023e 100755 --- a/src/freedombone-app-dokuwiki +++ b/src/freedombone-app-dokuwiki @@ -327,7 +327,7 @@ function install_dokuwiki { if [ -d /repos/dokuwiki ]; then mkdir /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs - cp -r -p /repos/dokuwiki/* /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs + cp -r -p /repos/dokuwiki/. /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs cd /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs git pull else diff --git a/src/freedombone-app-etherpad b/src/freedombone-app-etherpad index 5ace641b..bae5a0f0 100755 --- a/src/freedombone-app-etherpad +++ b/src/freedombone-app-etherpad @@ -490,7 +490,7 @@ function install_etherpad { if [ -d /repos/etherpad ]; then mkdir /var/www/$ETHERPAD_DOMAIN_NAME/htdocs - cp -r -p /repos/etherpad/* /var/www/$ETHERPAD_DOMAIN_NAME/htdocs + cp -r -p /repos/etherpad/. /var/www/$ETHERPAD_DOMAIN_NAME/htdocs cd /var/www/$ETHERPAD_DOMAIN_NAME/htdocs git pull else diff --git a/src/freedombone-app-friendica b/src/freedombone-app-friendica index c6c3d4b4..ed9b33db 100755 --- a/src/freedombone-app-friendica +++ b/src/freedombone-app-friendica @@ -348,7 +348,7 @@ function install_friendica { if [ -d /repos/friendica ]; then mkdir friendica - cp -r -p /repos/friendica/* friendica + cp -r -p /repos/friendica/. friendica cd friendica git pull else diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial index bee0f5e9..fd4ac2e4 100755 --- a/src/freedombone-app-gnusocial +++ b/src/freedombone-app-gnusocial @@ -554,7 +554,7 @@ function install_gnusocial_main { if [ -d /repos/gnusocial ]; then mkdir /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs - cp -r -p /repos/gnusocial/* /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs + cp -r -p /repos/gnusocial/. /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs git pull else @@ -821,7 +821,7 @@ function install_gnusocial_plugin_sharings { if [ -d /repos/sharings ]; then mkdir Sharings - cp -r -p /repos/sharings/* Sharings + cp -r -p /repos/sharings/. Sharings cd Sharings git pull else @@ -947,7 +947,7 @@ function install_gnusocial_markdown { if [ -d /repos/gnusocial-markdown ]; then mkdir Markdown - cp -r -p /repos/gnusocial-markdown/* Markdown + cp -r -p /repos/gnusocial-markdown/. Markdown cd Markdown git pull else diff --git a/src/freedombone-app-htmly b/src/freedombone-app-htmly index 10371321..4d926988 100755 --- a/src/freedombone-app-htmly +++ b/src/freedombone-app-htmly @@ -582,7 +582,7 @@ function install_htmly_from_repo { if [ -d /repos/htmly ]; then mkdir htdocs - cp -r -p /repos/htmly/* htdocs + cp -r -p /repos/htmly/. htdocs cd htdocs git pull else diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla index f847fed4..687ae55c 100755 --- a/src/freedombone-app-hubzilla +++ b/src/freedombone-app-hubzilla @@ -340,7 +340,7 @@ function install_hubzilla { if [ -d /repos/hubzilla ]; then mkdir hubzilla - cp -r -p /repos/hubzilla/* hubzilla + cp -r -p /repos/hubzilla/. hubzilla cd hubzilla git pull else @@ -356,7 +356,7 @@ function install_hubzilla { if [ -d /repos/hubzilla-addons ]; then mkdir $HUBZILLA_PATH/addon - cp -r -p /repos/hubzilla-addons/* $HUBZILLA_PATH/addon + cp -r -p /repos/hubzilla-addons/. $HUBZILLA_PATH/addon cd $HUBZILLA_PATH/addon git pull else diff --git a/src/freedombone-app-koel b/src/freedombone-app-koel index 4d56c3ef..647a2b97 100755 --- a/src/freedombone-app-koel +++ b/src/freedombone-app-koel @@ -490,7 +490,7 @@ function install_koel_main { if [ -d /repos/koel ]; then mkdir /var/www/$KOEL_DOMAIN_NAME/htdocs - cp -r -p /repos/koel/* /var/www/$KOEL_DOMAIN_NAME/htdocs + cp -r -p /repos/koel/. /var/www/$KOEL_DOMAIN_NAME/htdocs cd /var/www/$KOEL_DOMAIN_NAME/htdocs git pull else diff --git a/src/freedombone-app-librevault b/src/freedombone-app-librevault index 8125a972..4bdf1492 100755 --- a/src/freedombone-app-librevault +++ b/src/freedombone-app-librevault @@ -252,7 +252,7 @@ function install_librevault { if [ -d /repos/librevault ]; then mkdir $INSTALL_DIR/librevault - cp -r -p /repos/librevault/* $INSTALL_DIR/librevault + cp -r -p /repos/librevault/. $INSTALL_DIR/librevault cd $INSTALL_DIR/librevault git pull else diff --git a/src/freedombone-app-lychee b/src/freedombone-app-lychee index e50977d7..912e4562 100755 --- a/src/freedombone-app-lychee +++ b/src/freedombone-app-lychee @@ -372,7 +372,7 @@ function install_lychee_from_repo { if [ -d /repos/lychee ]; then mkdir htdocs - cp -r -p /repos/lychee/* htdocs + cp -r -p /repos/lychee/. htdocs cd htdocs git pull else diff --git a/src/freedombone-app-mailpile b/src/freedombone-app-mailpile index 18c1df36..c9e463b8 100755 --- a/src/freedombone-app-mailpile +++ b/src/freedombone-app-mailpile @@ -275,7 +275,7 @@ function install_mailpile { if [ -d /repos/mailpile ]; then mkdir mail - cp -r -p /repos/mailpile/* mail + cp -r -p /repos/mailpile/. mail cd mail git pull else diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix index a3c0731b..6bcc4495 100755 --- a/src/freedombone-app-matrix +++ b/src/freedombone-app-matrix @@ -509,7 +509,7 @@ function install_home_server { if [ -d /repos/matrix ]; then mkdir /etc/matrix - cp -r -p /repos/matrix/* /etc/matrix + cp -r -p /repos/matrix/. /etc/matrix cd /etc/matrix git pull else diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin index 58ecf801..22593f7e 100755 --- a/src/freedombone-app-mediagoblin +++ b/src/freedombone-app-mediagoblin @@ -284,7 +284,7 @@ function install_mediagoblin { if [ -d /repos/mediagoblin ]; then mkdir -p $MEDIAGOBLIN_BASE_DIR/mediagoblin - cp -r -p /repos/mediagoblin/* $MEDIAGOBLIN_BASE_DIR/mediagoblin + cp -r -p /repos/mediagoblin/. $MEDIAGOBLIN_BASE_DIR/mediagoblin cd $MEDIAGOBLIN_BASE_DIR/mediagoblin git pull chown -R mediagoblin:mediagoblin $MEDIAGOBLIN_BASE_DIR/mediagoblin diff --git a/src/freedombone-app-movim b/src/freedombone-app-movim index 870a52b8..3b2e3eff 100755 --- a/src/freedombone-app-movim +++ b/src/freedombone-app-movim @@ -335,7 +335,7 @@ function install_movim { if [ -d /repos/movim ]; then mkdir /var/www/$MOVIM_DOMAIN_NAME/htdocs - cp -r -p /repos/movim/* /var/www/$MOVIM_DOMAIN_NAME/htdocs + cp -r -p /repos/movim/. /var/www/$MOVIM_DOMAIN_NAME/htdocs cd /var/www/$MOVIM_DOMAIN_NAME/htdocs git pull else diff --git a/src/freedombone-app-nextcloud b/src/freedombone-app-nextcloud index 4d996c8e..f25a9d4a 100755 --- a/src/freedombone-app-nextcloud +++ b/src/freedombone-app-nextcloud @@ -419,7 +419,7 @@ function install_nextcloud_main { if [ -d /repos/nextcloud ]; then mkdir /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs - cp -r -p /repos/nextcloud/* /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs + cp -r -p /repos/nextcloud/. /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs cd /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs git pull else diff --git a/src/freedombone-app-pihole b/src/freedombone-app-pihole index 56239e9a..fdc5f769 100755 --- a/src/freedombone-app-pihole +++ b/src/freedombone-app-pihole @@ -378,7 +378,7 @@ function install_pihole { if [ -d /repos/pihole ]; then mkdir pihole - cp -r -p /repos/pihole/* pihole + cp -r -p /repos/pihole/. pihole cd pihole git pull else diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv index 6fb40f90..c2d07d47 100755 --- a/src/freedombone-app-postactiv +++ b/src/freedombone-app-postactiv @@ -551,7 +551,7 @@ function install_postactiv_main { if [ -d /repos/postactiv ]; then mkdir /var/www/$POSTACTIV_DOMAIN_NAME/htdocs - cp -r -p /repos/postactiv/* /var/www/$POSTACTIV_DOMAIN_NAME/htdocs + cp -r -p /repos/postactiv/. /var/www/$POSTACTIV_DOMAIN_NAME/htdocs cd /var/www/$POSTACTIV_DOMAIN_NAME/htdocs git pull else diff --git a/src/freedombone-app-profanity b/src/freedombone-app-profanity index 45fb1eee..13650ecf 100755 --- a/src/freedombone-app-profanity +++ b/src/freedombone-app-profanity @@ -200,7 +200,7 @@ function install_profanity { # dependency for profanity not available in debian if [ -d /repos/libmesode ]; then mkdir $INSTALL_DIR/libmesode - cp -r -p /repos/libmesode/* $INSTALL_DIR/libmesode + cp -r -p /repos/libmesode/. $INSTALL_DIR/libmesode cd $INSTALL_DIR/libmesode git pull else @@ -218,7 +218,7 @@ function install_profanity { # build profanity if [ -d /repos/profanity ]; then mkdir $INSTALL_DIR/profanity - cp -r -p /repos/profanity/* $INSTALL_DIR/profanity + cp -r -p /repos/profanity/. $INSTALL_DIR/profanity cd $INSTALL_DIR/profanity git pull else @@ -242,7 +242,7 @@ function install_profanity { if [ -d /repos/profanity-omemo ]; then mkdir $INSTALL_DIR/profanity-omemo-plugin - cp -r -p /repos/profanity-omemo/* $INSTALL_DIR/profanity-omemo-plugin + cp -r -p /repos/profanity-omemo/. $INSTALL_DIR/profanity-omemo-plugin cd $INSTALL_DIR/profanity-omemo-plugin git pull else diff --git a/src/freedombone-app-rss b/src/freedombone-app-rss index f2677f89..a2f36018 100755 --- a/src/freedombone-app-rss +++ b/src/freedombone-app-rss @@ -324,7 +324,7 @@ function install_rss_main { if [ -d /repos/rss ]; then mkdir tt-rss - cp -r -p /repos/rss/* tt-rss + cp -r -p /repos/rss/. tt-rss cd tt-rss git pull else @@ -608,7 +608,7 @@ function install_rss_mobile_reader { if [ -d /repos/rss-mobile ]; then mkdir ttrss-mobile - cp -r -p /repos/rss-mobile/* ttrss-mobile + cp -r -p /repos/rss-mobile/. ttrss-mobile cd ttrss-mobile git pull else diff --git a/src/freedombone-app-searx b/src/freedombone-app-searx index c5f1008a..939ce0ad 100755 --- a/src/freedombone-app-searx +++ b/src/freedombone-app-searx @@ -881,7 +881,7 @@ function install_searx { if [ -d /repos/searx ]; then mkdir searx - cp -r -p /repos/searx/* searx + cp -r -p /repos/searx/. searx cd searx git pull else diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox index 9c3466b4..08166153 100755 --- a/src/freedombone-app-tox +++ b/src/freedombone-app-tox @@ -129,7 +129,7 @@ function mesh_tox_qtox { if [ -d /repos/qtox ]; then mkdir ${rootdir}$INSTALL_DIR/qtox - cp -r -p /repos/qtox/* ${rootdir}$INSTALL_DIR/qtox + cp -r -p /repos/qtox/. ${rootdir}$INSTALL_DIR/qtox cd ${rootdir}$INSTALL_DIR/qtox git pull else @@ -334,7 +334,7 @@ function tox_avahi { if [ -d /repos/toxid ]; then mkdir $INSTALL_DIR/toxid - cp -r -p /repos/toxid/* $INSTALL_DIR/toxid + cp -r -p /repos/toxid/. $INSTALL_DIR/toxid cd $INSTALL_DIR/toxid git pull else @@ -476,7 +476,7 @@ function mesh_tox_node { if [ ! -d ${rootdir}${INSTALL_DIR}/toxcore ]; then if [ -d /repos/toxcore ]; then mkdir ${rootdir}${INSTALL_DIR}/toxcore - cp -r -p /repos/toxcore/* ${rootdir}${INSTALL_DIR}/toxcore + cp -r -p /repos/toxcore/. ${rootdir}${INSTALL_DIR}/toxcore cd ${rootdir}${INSTALL_DIR}/toxcore git pull else @@ -606,7 +606,7 @@ function mesh_tox_avahi { if [ -d /repos/toxid ]; then mkdir ${rootdir}${INSTALL_DIR}/toxid - cp -r -p /repos/toxid/* ${rootdir}${INSTALL_DIR}/toxid + cp -r -p /repos/toxid/. ${rootdir}${INSTALL_DIR}/toxid cd ${rootdir}${INSTALL_DIR}/toxid git pull else @@ -681,7 +681,7 @@ function mesh_tox_client { echo "mkdir -p $INSTALL_DIR" >> $TEMP_SCRIPT echo 'if [ -d /repos/toxic ]; then' >> $TEMP_SCRIPT echo " mkdir $INSTALL_DIR/toxic" >> $TEMP_SCRIPT - echo " cp -r -p /repos/toxic/* $INSTALL_DIR/toxic" >> $TEMP_SCRIPT + echo " cp -r -p /repos/toxic/. $INSTALL_DIR/toxic" >> $TEMP_SCRIPT echo " cd $INSTALL_DIR/toxic" >> $TEMP_SCRIPT echo ' git pull' >> $TEMP_SCRIPT echo 'else' >> $TEMP_SCRIPT diff --git a/src/freedombone-app-turtl b/src/freedombone-app-turtl index 92364831..a5c881fd 100755 --- a/src/freedombone-app-turtl +++ b/src/freedombone-app-turtl @@ -599,7 +599,7 @@ __ENDCONFIG__ if [ -d /repos/turtl ]; then mkdir $TURTL_BASE_DIR/api - cp -r -p /repos/turtl/* $TURTL_BASE_DIR/api + cp -r -p /repos/turtl/. $TURTL_BASE_DIR/api cd $TURTL_BASE_DIR/api git pull else diff --git a/src/freedombone-app-zeronet b/src/freedombone-app-zeronet index ff7a5696..8f3d716a 100755 --- a/src/freedombone-app-zeronet +++ b/src/freedombone-app-zeronet @@ -435,7 +435,7 @@ function mesh_zeronet { if [ -d /repos/zeronet ]; then mkdir $rootdir$MESH_INSTALL_DIR/zeronet - cp -r -p /repos/zeronet/* $rootdir$MESH_INSTALL_DIR/zeronet + cp -r -p /repos/zeronet/. $rootdir$MESH_INSTALL_DIR/zeronet cd $rootdir$MESH_INSTALL_DIR/zeronet git pull else diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 879f2cc7..78fbc85e 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -997,7 +997,7 @@ function image_install_inadyn { if [ -d /repos/inadyn ]; then mkdir $rootdir/root/build/inadyn - cp -r -p /repos/inadyn/* $rootdir/root/build/inadyn + cp -r -p /repos/inadyn/. $rootdir/root/build/inadyn cd $rootdir/root/build/inadyn git pull else diff --git a/src/freedombone-utils-cmake b/src/freedombone-utils-cmake index 28e601c5..61891220 100755 --- a/src/freedombone-utils-cmake +++ b/src/freedombone-utils-cmake @@ -40,7 +40,7 @@ function mesh_install_cmake { if [ -d /repos/cmake ]; then mkdir $rootdir$INSTALL_DIR/cmake - cp -r -p /repos/cmake/* $rootdir$INSTALL_DIR/cmake + cp -r -p /repos/cmake/. $rootdir$INSTALL_DIR/cmake cd $rootdir$INSTALL_DIR/cmake git pull else @@ -95,7 +95,7 @@ function install_cmake { if [ -d /repos/cmake ]; then mkdir $INSTALL_DIR/cmake - cp -r -p /repos/cmake/* $INSTALL_DIR/cmake + cp -r -p /repos/cmake/. $INSTALL_DIR/cmake cd $INSTALL_DIR/cmake git pull else diff --git a/src/freedombone-utils-filesystem b/src/freedombone-utils-filesystem index 9ce5e457..f88d6548 100755 --- a/src/freedombone-utils-filesystem +++ b/src/freedombone-utils-filesystem @@ -40,7 +40,7 @@ function mesh_install_tomb { if [ -d /repos/tomb ]; then mkdir ${rootdir}/$INSTALL_DIR/tomb - cp -r -p /repos/tomb/* ${rootdir}/$INSTALL_DIR/tomb + cp -r -p /repos/tomb/. ${rootdir}/$INSTALL_DIR/tomb cd ${rootdir}/$INSTALL_DIR/tomb git pull else @@ -83,7 +83,7 @@ function install_tomb { if [ -d /repos/tomb ]; then mkdir $INSTALL_DIR/tomb - cp -r -p /repos/tomb/* $INSTALL_DIR/tomb + cp -r -p /repos/tomb/. $INSTALL_DIR/tomb cd $INSTALL_DIR/tomb git pull else diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools index 369b8039..fe931bda 100755 --- a/src/freedombone-utils-gnusocialtools +++ b/src/freedombone-utils-gnusocialtools @@ -214,7 +214,7 @@ function install_qvitter { if [ -d /repos/qvitter ]; then mkdir Qvitter - cp -r -p /repos/qvitter/* Qvitter + cp -r -p /repos/qvitter/. Qvitter cd Qvitter git pull else @@ -344,7 +344,7 @@ function install_pleroma_front_end { if [ -d /repos/pleroma ]; then mkdir -p $INSTALL_DIR/pleroma - cp -r -p /repos/pleroma/* $INSTALL_DIR/pleroma + cp -r -p /repos/pleroma/. $INSTALL_DIR/pleroma cd $INSTALL_DIR/pleroma git pull else diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web index a80c65b2..432a3334 100755 --- a/src/freedombone-utils-web +++ b/src/freedombone-utils-web @@ -443,7 +443,7 @@ function install_dynamicdns { if [ ! -d $INSTALL_DIR/inadyn ]; then if [ -d /repos/inadyn ]; then mkdir $INSTALL_DIR/inadyn - cp -r -p /repos/inadyn/* $INSTALL_DIR/inadyn + cp -r -p /repos/inadyn/. $INSTALL_DIR/inadyn cd $INSTALL_DIR/inadyn git pull else