From owner-freebsd-questions@freebsd.org Mon Nov 2 23:22:40 2020 Return-Path: Delivered-To: freebsd-questions@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD0A745DEB6 for ; Mon, 2 Nov 2020 23:22:40 +0000 (UTC) (envelope-from johnl@iecc.com) Received: from gal.iecc.com (gal.iecc.com [IPv6:2001:470:1f07:1126:0:43:6f73:7461]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "gal.iecc.com", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CQ88b58bSz49hn for ; Mon, 2 Nov 2020 23:22:39 +0000 (UTC) (envelope-from johnl@iecc.com) Received: (qmail 67781 invoked from network); 2 Nov 2020 23:22:33 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=iecc.com; h=date:message-id:from:to:cc:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:cleverness; s=108bf.5fa094b9.k2011; bh=hZqROo1hhoQJ9dttQTO01YqpAyEFJYbJaPYTrzQLK6c=; b=NWjJMClmCgNUhVsR6M872pmwp3QkRTnBwLAXRebDnibhLMUOrou/R9jx2v9ErZ1G79SwnvfQHLi5WURI/BtpsPvEGSceNUmreQsJtK6Ai60kS5ky7ZBEZQGOuyaYaFfCawryAxAsnKAPD84vZUIM1M9lsmqOOuxKvDzSIdfc7CdKo/UkbdPUaIcxVLxL1th00nFPei+Oc3sqcfyifs4q5xE24AZh/CFi0Kc7W+rgBQEMQchSMZey6xBuRD96Fk3LQzwWSwGQA3IuBYuoeiuJLsJepJVEvIeZKU3JbD2Tmk67dQVgw8FVa9wQHZUJim689NROOCRFoa5LLYbzCW1c5Q== Received: from ary.qy ([IPv6:2001:470:1f07:1126::78:696d:6170]) by imap.iecc.com ([IPv6:2001:470:1f07:1126::78:696d:6170]) with ESMTPS (TLS1.2 ECDHE-RSA AES-256-GCM AEAD) via TCP6; 02 Nov 2020 23:22:32 -0000 Received: by ary.qy (Postfix, from userid 501) id 515C62548A9E; Mon, 2 Nov 2020 18:22:31 -0500 (EST) Date: 2 Nov 2020 18:22:31 -0500 Message-Id: <20201102232232.515C62548A9E@ary.qy> From: "John Levine" To: freebsd-questions@freebsd.org Cc: peo@nethead.se Subject: Re: simple shell script to compare two dirs recursively In-Reply-To: <66b0d570-4e46-7971-5d30-33256feeda55@nethead.se> Organization: Taughannock Networks X-Headerized: yes Cleverness: minimal Mime-Version: 1.0 Content-type: text/plain; charset=utf-8 Content-transfer-encoding: 8bit X-Rspamd-Queue-Id: 4CQ88b58bSz49hn X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=iecc.com header.s=108bf.5fa094b9.k2011 header.b=NWjJMClm; dmarc=pass (policy=none) header.from=iecc.com; spf=pass (mx1.freebsd.org: domain of johnl@iecc.com designates 2001:470:1f07:1126:0:43:6f73:7461 as permitted sender) smtp.mailfrom=johnl@iecc.com X-Spamd-Result: default: False [-5.36 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[iecc.com:s=108bf.5fa094b9.k2011]; NEURAL_HAM_MEDIUM(-1.04)[-1.042]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_MED(-2.00)[iecc.com:dkim]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:1f07:1126::/64]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; NEURAL_HAM_LONG(-1.03)[-1.033]; HAS_ORG_HEADER(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[iecc.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[iecc.com,none]; NEURAL_HAM_SHORT(-0.79)[-0.788]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; MAILMAN_DEST(0.00)[freebsd-questions] X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Nov 2020 23:22:40 -0000 In article <66b0d570-4e46-7971-5d30-33256feeda55@nethead.se> you write: >It is to keep track of a Wordpress plugin that we must do changes to in >the php code, I'm just trying to figure out a way to apply our changes >after the plugin is updated and our alterations are overwritten. > >In a way that is simple, that is. I'd try using diff -r -C3 to find the diffs and patch to apply the diffs. Patch is pretty good at finding where the diffs go if the files have changed a little. -- Regards, John Levine, johnl@taugh.com, Primary Perpetrator of "The Internet for Dummies", Please consider the environment before reading this e-mail. https://jl.ly