linhes-dev: lh_setup_dev.sh: add rclone.conf; modify ccm pacman.conf template

2 files changed, 16 insertions, 3 deletions

diff --git a/linhes/linhes-dev/PKGBUILD b/linhes/linhes-dev/PKGBUILD
index df74320..2a2981f 100644
--- a/linhes/linhes-dev/PKGBUILD
+++ b/linhes/linhes-dev/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=linhes-dev
 pkgver=9.0.0
-pkgrel=7
+pkgrel=8
 pkgdesc="Scripts to develop LinHES"
 arch=('x86_64')
 license=('GPL2')
@@ -10,7 +10,7 @@ url="http://linhes.org/"
 source=('lh_sync.sh' 'mp.py' 'lh_setup_dev.sh' 'lh_update_db_repo.sh')
 sha256sums=('3a64b4125b56c6f95cc9dc85ce58ebd1c0612b22fb27c3e76d4d9a5570f2d61e'
             '16787763282f20b15eee2377712e85d5653a9229d2b73d224c0fd4532436614a'
-            '081ac1ccb40df0c8aa82cd3841a39aa87ead4ea32c9ac6a76c5a7d7f0d10a80a'
+            '64c9ec7a519405e5967f90fd9e3d27207ad67abb47042bf8f43bfc5db761773e'
             '86c9ebe77228f7e3cc07cb05f480e5584e0e3cad1b889b63a50821f7323bf449')
 
 package() {
diff --git a/linhes/linhes-dev/lh_setup_dev.sh b/linhes/linhes-dev/lh_setup_dev.sh
index 1d9f783..e38e73f 100755
--- a/linhes/linhes-dev/lh_setup_dev.sh
+++ b/linhes/linhes-dev/lh_setup_dev.sh
@@ -15,6 +15,7 @@ mkdir -p /data/dev/pkg_repo/src_packages/linhes-testing
 echo -e "\n\nSetup clean-chroot-manager (ccm) and edit ~/.config/clean-chroot-manager.conf"...
 sudo ccm l
 sed -i 's/CHROOTPATH64=.*/CHROOTPATH64=\"\/data\/dev\/LH_buildroot\"/' ~/.config/clean-chroot-manager.conf
+sed -i 's/#CUSTOM_PACMAN_CONF=.*/CUSTOM_PACMAN_CONF=\"\/usr\/share\/linhes\/templates\/pacman.conf.template"/' ~/.config/clean-chroot-manager.conf
 sudo ccm c
 
 echo -e "\n\nChanging setting in /etc/makepkg.conf..."
@@ -48,10 +49,22 @@ fi
 END
 fi
 
+echo -e "\n\nAdd rclone.conf..."
+if ! grep -q 'host = linhes.org' ~/.config/rclone/rclone.conf; then
+cat >> ~/.config/rclone/rclone.conf<<END
+[ssh]
+type = sftp
+host = linhes.org
+user = reposync
+key_file = ssh-agent
+pubkey_file = ~/.ssh/id_rsa.pub
+END
+fi
+
 # clone the git linhes_pkgbuild
 # Checkout the repo. You will need to have been given a dev account on
 # linhes.org. This involves creating a public ssh key and supplying it to
 # one of the linhes.org admins. The key is created using ssh-keygen. The
 # resulting public key will be stored in .ssh/id_rsa.pub.
 echo -e "\n\nCheckout the repo manually. You will need to be given a dev account on linhes.org. This involves creating a public ssh key and supplying it toone of the linhes.org admins. The key is created using ssh-keygen. The resulting public key will be stored in .ssh/id_rsa.pub."
-echo -e "EXAMPLE: \ncd /data/dev\ngit clone git@linhes.org:linhes_pkgbuild\n\n"
+echo -e "EXAMPLE: \ncd /data/dev\ngit clone git@linhes.org:linhes_pkgbuild\ngit checkout testing\n\n"