From patchwork Wed Oct 20 17:46:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4802 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4HZJ2Y2Px6z3wcx for ; Wed, 20 Oct 2021 17:46:45 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4HZJ2W4Tn0z1TF; Wed, 20 Oct 2021 17:46:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4HZJ2W21RPz2yj9; Wed, 20 Oct 2021 17:46:43 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4HZJ2V2Jgyz2xPC for ; Wed, 20 Oct 2021 17:46:42 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4HZJ2T3ggpzbW; Wed, 20 Oct 2021 17:46:41 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1634752001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8TBSzCc3UfbIu6pO+gtj9AFnWhlmg5xO3JHRbZZtbiQ=; b=PYb5tv+b0pTQ79WoU2f8p26N/wFvAGa5O78bsXW3BELfvkSlCSHpaTVoPRDC3/d+JZlESo nj4YLRamV48rjDAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1634752001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8TBSzCc3UfbIu6pO+gtj9AFnWhlmg5xO3JHRbZZtbiQ=; b=S1+XCmZ1D78YLt9miydc0sFJHC/RHJvKarmOtcIZoG/V9VYSyKMDjA7yzUkTKe55FQ0PX5 bMrOBp5FTHZpml/O1C8gVK15RhBjVt4456zp/LeU540/U5rscGHDlx2CkVxEQCn0Li35c0 a9kQC7MZQb6/I39gCZttVbJxw2E5067QStP3nVSq97Gd08iCnID01tL1/KijRrKdI45/J3 Dab6oXYMP+1lafuz/ZGs17Xyu9L/KyuxhkYtcz658SbeiboPnvag64WR2n4ol4WMtU6aFh qYrrJlmCSc8MVZto+UosXBgDOxo9OcASokweUlGiWailNYPt51l4kMY/CqsoFQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] make.sh: Rewrite uploadsrc with rsync Date: Wed, 20 Oct 2021 17:46:37 +0000 Message-Id: <20211020174637.2688-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Instead of having a very dodgy diff of filelists, this rsync call does everything automatically and only requires authentication once. Signed-off-by: Michael Tremer --- make.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/make.sh b/make.sh index d9e560cf0..4a5442b8a 100755 --- a/make.sh +++ b/make.sh @@ -1903,24 +1903,24 @@ gettoolchain) fi ;; uploadsrc) - PWD=`pwd` if [ -z $IPFIRE_USER ]; then echo -n "You have to setup IPFIRE_USER first. See .config for details." print_status FAIL exit 1 fi - URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }') - REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE}) + URL_SOURCE="$(awk '/^URL_SOURCE/ { print $3 }' lfs/Config)" + + rsync \ + --recursive \ + --update \ + --ignore-existing \ + --progress \ + --human-readable \ + --exclude="toolchains/" \ + "${BASEDIR}/cache/" \ + "${IPFIRE_USER}@${URL_SOURCE}" - for file in ${BASEDIR}/cache/*; do - [ -d "${file}" ] && continue - grep -q "$(basename ${file})" <<<$REMOTE_FILES && continue - NEW_FILES="$NEW_FILES $file" - done - [ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE} - cd $BASEDIR - cd $PWD exit 0 ;; lang)