From patchwork Fri Jan 10 11:05:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13934264 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B5D4202F8E for ; Fri, 10 Jan 2025 11:05:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736507122; cv=none; b=qHBP1Kxs62r19zrgPK5LuZ7cnCKwhX54n7UZYigob69V0aQQNcqDsoOLFCZ8cFSbpau8DA7xnJnXTGWSQtiWoucwB29KJuNH2XUzKVdobCnSsXIclkwfLuWc9ujW3CAH5cHXaotKYu4YI+jjVqa38tIpzAPWrYqaH7RGB2MagWU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736507122; c=relaxed/simple; bh=OUvwKYh6VEZ01uR8wkG1nXSQhgfNKwaFGOPvq9wVTts=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iLygWN4r8Cwn1uuvZHHsxjatXz3BGoBuBNyd/3oW40s25gnbnykeZlxlCvvrYBycvqFgi0HhTsenHSgkHZ2ZgEEy95qVCnydhUvAOHZfnhxnfUdWp1wCy7+as/2gQlaQ0CYwRpwZXgPGq4CzgNoLDWM3AQ8hswjSwcFqWMw5+cE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=a8bKPL7J; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="a8bKPL7J" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736507119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JSPu0e5TGhfMtbkmXCsXwBRiCajFy8txLF3yrDbRlDI=; b=a8bKPL7J7uZZUGe83Ff5OiNznZ2vnPSEOyMraTVCjbwhD1nu12aK8JAPWkDb0gMRkktzI/ B9kSc5csYNGp/zdRJy6hEijVi6C23a2CE/YCreCIQ0PUp5fzvw+MTb4sBgMWeX1dhyPkPE Eqync+wijhklwF/u85b1Cq66hDm0F7M= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-14-eNJEBeOMNSS9TiEMVvTTMA-1; Fri, 10 Jan 2025 06:05:18 -0500 X-MC-Unique: eNJEBeOMNSS9TiEMVvTTMA-1 X-Mimecast-MFC-AGG-ID: eNJEBeOMNSS9TiEMVvTTMA Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4362552ce62so9990375e9.0 for ; Fri, 10 Jan 2025 03:05:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736507117; x=1737111917; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JSPu0e5TGhfMtbkmXCsXwBRiCajFy8txLF3yrDbRlDI=; b=QAgA92McZ3liG4KUyXrnYeGaBBPRvFgE4gquv47T2TFd902S81OIRS15+GybjOz12+ x7KZ5z/nKa0LZVuG84X7BoRTFDsGSSZFT6+12Q2s8bMx8/pSi9+PMv0qLIrbxGt4TtaH ap7NNC8P65WPdLmfz36UL457tMOsWdhzHGF/iYFQN9xBNSPuowu11myyx3P7nWJ9odP2 pG6pSPMuBIkWiAtDrFZ6zA70GzuFR2EmkYjxJehrKMy8RiRIsIxozXKhY7PEjsiv7+mV jXdE7SbCaPkr3LisMwPMC9sH+mn5ZR3CCO98q4ISAkUOxh4ucKJ62JdwXkgFolQivIQY kFoQ== X-Gm-Message-State: AOJu0Yzp7ztlT6cKDEwU4vHGmbCStCrQNu/E/HWX1KyD6zk3Jo8vWFjP 7heoYerbXBNNVQkNaCDm0wquTImKlCvijfqmV0ekUyZfeotkU4ie97DCiE4xxKCrDH8kQd9EzrD 8BIlFayYOet/2Ob44aqNMN9lKdg3N6o4Bes0z32UR3VScc5iTCdzzixuZvl/kGVfeDSkApw8nDK mQTFQKkNAVIL+HKY+1ZXgH2XvkJENQGfJjXRvULbGr X-Gm-Gg: ASbGncti6/eUPFOtwwsB59eo7ijLwnXK/n3MrElU230xY2Epq6bdGVfhv/F3hssPIHE 2lWGQpPMzqkfdtv1lP5EHwww0ktwerZUbeXwUNDF7aI/qqRtn0J6ks+yNCjIve63x72tvZZ05+0 Ou7EAg33PFiRi0kymqdMyezbkMjC38g3xqQgmgqMMWZCfTFKZfql+Hs4NkNRe/Vsc4W9aiaBfjL hL3HnjOfs5pdRAxQVjtM0GteTvv7B3ZKiKZQVXbG1DPZuk2jNso9dK+xOTpjNOoue+tAJ4XMi+S +gYxX3U= X-Received: by 2002:a05:600c:1384:b0:434:f2bf:1708 with SMTP id 5b1f17b1804b1-436e267822amr93806965e9.7.1736507116788; Fri, 10 Jan 2025 03:05:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IGsoAILKAZw7wVZTkhONLko7Rcb1HTgISeaAzZuLGLzI/RdL9WSqyjNRlrCVoUrDvcVR7JoLw== X-Received: by 2002:a05:600c:1384:b0:434:f2bf:1708 with SMTP id 5b1f17b1804b1-436e267822amr93806625e9.7.1736507116357; Fri, 10 Jan 2025 03:05:16 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e2ddcb5bsm84774835e9.23.2025.01.10.03.05.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 03:05:16 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Fri, 10 Jan 2025 12:05:06 +0100 Subject: [PATCH 1/4] release.sh: add signing and fix outdated commands Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250110-update-release-v1-1-61e40b8ffbac@kernel.org> References: <20250110-update-release-v1-0-61e40b8ffbac@kernel.org> In-Reply-To: <20250110-update-release-v1-0-61e40b8ffbac@kernel.org> To: linux-xfs@vger.kernel.org Cc: Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1903; i=aalbersh@kernel.org; h=from:subject:message-id; bh=OUvwKYh6VEZ01uR8wkG1nXSQhgfNKwaFGOPvq9wVTts=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0hv+vVYta/6VZn9k7eTtXtMXGYZPemuy27VI71/b5 K15WR7tSdIdpSwMYlwMsmKKLOuktaYmFUnlHzGokYeZw8oEMoSBi1MAJhLpzvDPwHCXncVFR4n7 PnuO152a8SF3BcvagpBrjTv3TX3n2/rkJCPD03bHptY3s/xsLpuejZ5z1SuFp2OqiPY+w8ajd34 ob3nOCQCCQUw0 X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Signed-off-by: Andrey Albershteyn --- release.sh | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/release.sh b/release.sh index 577257a354d442e1cc0a2b9381b11ffbe2f64a71..b15ed610082f34928827ab0547db944cf559cef4 100755 --- a/release.sh +++ b/release.sh @@ -9,6 +9,8 @@ # configure.ac (with new version string) # debian/changelog (with new release entry, only for release version) +set -e + . ./VERSION version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} @@ -16,21 +18,38 @@ date=`date +"%-d %B %Y"` echo "Cleaning up" make realclean +rm -rf "xfsprogs-${version}.tar" \ + "xfsprogs-${version}.tar.gz" \ + "xfsprogs-${version}.tar.asc" \ + "xfsprogs-${version}.tar.sign" echo "Updating CHANGES" sed -e "s/${version}.*/${version} (${date})/" doc/CHANGES > doc/CHANGES.tmp && \ mv doc/CHANGES.tmp doc/CHANGES echo "Commiting CHANGES update to git" -git commit -a -m "${version} release" +git commit --all --signoff --message="xfsprogs: Release v${version} + +Update all the necessary files for a v${version} release." echo "Tagging git repository" -git tag -a -m "${version} release" v${version} +git tag --annotate --sign --message="Release v${version}" v${version} echo "Making source tarball" make dist +gunzip -k "xfsprogs-${version}.tar.gz" -#echo "Sign the source tarball" -#gpg --detach-sign xfsprogs-${version}.tar.gz +echo "Sign the source tarball" +gpg \ + --detach-sign \ + --armor \ + "xfsprogs-${version}.tar" -echo "Done. Please remember to push out tags using \"git push --tags\"" +echo "Verify signature" +gpg \ + --verify \ + "xfsprogs-${version}.tar.asc" + +mv "xfsprogs-${version}.tar.asc" "xfsprogs-${version}.tar.sign" + +echo "Done. Please remember to push out tags using \"git push origin v${version}\"" From patchwork Fri Jan 10 11:05:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13934265 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA669205AA8 for ; Fri, 10 Jan 2025 11:05:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736507123; cv=none; b=HcgPm3sFtU4o84eJ9jlZdRATrhcmCRPWoJAhmbz7NSrY9BWL5yaCczINNjvz9BJmWbum0tpCbYz/zJ0DOgIpswPD4JwBA86ZCyyEpuq8lpBUlT6frO7kW+Rqtt9XbogiIo1T/SOquYel+FWNmLZt8t7yH1e3N5qzFjenhqfKWBI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736507123; c=relaxed/simple; bh=GvVxfRTpG9NHuQlcYhKEbz5tLJqKGeVwvpASR4E785w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iWzUWs6mmnKRjovtOYI69yL0TPHvp+8Z0mrTM9z9j+VruEb6vnAFibhmkH2JqNKpXaG1MsIqVUKZCoQ8xWJTbmK1oFSv1HQqTCJtE5gV/7VhFVJa3cD+jG2o4F7UUGyemigvV0E845VTDeBh46o+NY21cFioS/hkCky+JP9ekrM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=LUvPfIZr; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LUvPfIZr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736507120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3/+9Tg1Pbx7KMuMaajlZwPzfDNRvl9QP8X4iGqp91Wg=; b=LUvPfIZrpm7bThaz6dAluvaJX5w5U5cO2RngHX9TKRRx4z3l0MUN6ksxX5KcBkRrU6y4pt o48YkgDNHNMiuXZpglH3+Qyy/GCoIRVs2x+yppXWirHlhEQ2TFCARk4KVFQiB4iegidiYJ HgvwlfroIKc1/OIkJ4DvoP6ynXtYAf0= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-600-VlQH0IbVOw2nRd6jXgnmhA-1; Fri, 10 Jan 2025 06:05:19 -0500 X-MC-Unique: VlQH0IbVOw2nRd6jXgnmhA-1 X-Mimecast-MFC-AGG-ID: VlQH0IbVOw2nRd6jXgnmhA Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-385e27c5949so1145121f8f.3 for ; Fri, 10 Jan 2025 03:05:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736507118; x=1737111918; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3/+9Tg1Pbx7KMuMaajlZwPzfDNRvl9QP8X4iGqp91Wg=; b=LYj3Az+apvVkKoQL4qSf0KwgfThOrdZXPTrpUWmZSk6+9Mj0Va2nYNfTXUMgpDAGzC l0mjRHtbZmbgd1sAn21ZtjJ10jdVOh8e+5AqEoj11WuRWYLd/pjUARctn4hNeg6UdbRs 2fClqecHHWDhBnq4IEoTiQSKFFEd+gde3Q0MtorIYxM662Fn+T321ilmsbnUFVH8Z1sD QiSqxW8fVkRMBuHXIPiA5sLUYoz+OuD8cnGcyrBmCiBfCmPpHnk08fRktuP6CC62q9Ff 7+44M+4Jc2UaCPpEmzMncTL/ifuPALrw+iwSMNIiVWgW0kgZiNrnF4LvvV3KTHg6g7Ry 3Vmg== X-Gm-Message-State: AOJu0Yy4faeOEwWwaNXUsohCQ51cIcWn4rJLBtAdVrBnS3kFRDO886JL BXbXS3nBtSCoEzRbYbGUM+/OYSlC0Yxupzaux8Rm214eE1AN5LlyqPCRI8WPXFcP2qLKWmSAYGu TNQ2A5el3obs8Ub4IK6XA4s2x2bdua+GicnbWqqe1RPyh0GbtEBT9HXQD/VP0ArfWj0RLcQbT1q cYCicc6uYf3m0b3HBV26IoeyS4Fvdyxmb03Fmtbam3 X-Gm-Gg: ASbGnctRd7IUX+LfwLgLobXI65NTO8WCAED8DNjKhMTlL6HqVTb5EGV3bca1ZTk61UF Zq0qt/dwhbuBAMzV4w/2UxnEJ9uaM0Qq60fUB/aOkICseiE+4WXnPAjjvaAEekllVQU93nefocq CoOAYz2YIAy1N4nMyxbUGt5r7YmOIr4iSZVSj2UsMXDMgfbAYdHpnRWbO+Jva2detfzuCIWQjE7 N6+uL1mpRNuEAr4193nRn/1pwAtW8sWl1jbPNWzIzhAekoaT709r4Ci9hLL2dTOg8EqNGiHRy6s 5ARbuqA= X-Received: by 2002:a05:6000:154a:b0:385:eeb9:a5bb with SMTP id ffacd0b85a97d-38a872de3femr9378704f8f.17.1736507117720; Fri, 10 Jan 2025 03:05:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IGuvbejlVdVr7p4kKlExFJkcl9Wt/QK5sY9Qn7LGu+S/34NvHyblocEHBuzEuvT9apKkSVTyA== X-Received: by 2002:a05:6000:154a:b0:385:eeb9:a5bb with SMTP id ffacd0b85a97d-38a872de3femr9378677f8f.17.1736507117251; Fri, 10 Jan 2025 03:05:17 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e2ddcb5bsm84774835e9.23.2025.01.10.03.05.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 03:05:16 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Fri, 10 Jan 2025 12:05:07 +0100 Subject: [PATCH 2/4] release.sh: add --kup to upload release tarball to kernel.org Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250110-update-release-v1-2-61e40b8ffbac@kernel.org> References: <20250110-update-release-v1-0-61e40b8ffbac@kernel.org> In-Reply-To: <20250110-update-release-v1-0-61e40b8ffbac@kernel.org> To: linux-xfs@vger.kernel.org Cc: Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1234; i=aalbersh@kernel.org; h=from:subject:message-id; bh=GvVxfRTpG9NHuQlcYhKEbz5tLJqKGeVwvpASR4E785w=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0hv+vZ4875zW9b+PPsaxiLOfWeE/WcZr94utTH4H3 UV2cc3cq/aoo5SFQYyLQVZMkWWdtNbUpCKp/CMGNfIwc1iZQIYwcHEKwERy7zH8D1jB4XtCv2dq dYbv3PmnrrEsZnMJa8tNyO6ZImmd67j3NyPDRrWTy+ekct36dXSeWesNhdffKiTP2s52e13GeFT jrO1adgBTskok X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Signed-off-by: Andrey Albershteyn --- release.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/release.sh b/release.sh index b15ed610082f34928827ab0547db944cf559cef4..a23adc47efa5163b4e0082050c266481e4051bfb 100755 --- a/release.sh +++ b/release.sh @@ -16,6 +16,30 @@ set -e version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} date=`date +"%-d %B %Y"` +KUP=0 + +help() { + echo "$(basename) - create xfsprogs release" + printf "\t[--kup|-k] upload final tarball with KUP\n" +} + +while [ $# -gt 0 ]; do + case "$1" in + --kup|-k) + KUP=1 + ;; + --help|-h) + help + exit 0 + ;; + *) + >&2 printf "Error: Invalid argument\n" + exit 1 + ;; + esac + shift +done + echo "Cleaning up" make realclean rm -rf "xfsprogs-${version}.tar" \ @@ -52,4 +76,11 @@ gpg \ mv "xfsprogs-${version}.tar.asc" "xfsprogs-${version}.tar.sign" +if [ $KUP -eq 1 ]; then + kup put \ + xfsprogs-${version}.tar.gz \ + xfsprogs-${version}.tar.sign \ + pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.gz +fi; + echo "Done. Please remember to push out tags using \"git push origin v${version}\"" From patchwork Fri Jan 10 11:05:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13934266 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB141202F8E for ; Fri, 10 Jan 2025 11:05:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736507124; cv=none; b=jTdfYEaw1sqOaBP32HNZugIQ/Z1HM/OnpRqlTaofYX1lBoGimUMkpmhpxsyAfeAWTzQ2zbgDR+l3PXus3kIKQdMM6e8k/DZFDI0FmdawsOpiKBD4mKxf5oiHadbhUQdyQDpstKAN0u9cD9GA/bg6KBI9DuwQgOvWlFS7i+ZVQes= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736507124; c=relaxed/simple; bh=2EUJESO8xyry4tieamUkyHtngI/WVawE7Imfc+Z+388=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dSXRXWB8puzwJnZQDwTkwT/o3JeThTjgJIV6AdqVySqccAIYC1Xu04QGiPzn8ArVVdetclvPqEnvSLwGNRBWO/rPl3WUh+JQgRziW+6FnjqW/b1/MXJTFyooNc+dTxqMgqikBW7va6Y7e7mGy9PcmUstY6zXSxW6vJBi6zf4MgI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=cxqT8LBA; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cxqT8LBA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736507121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GDrHeHcxdMc+m86AV4aP2MIFDlrI5kqERuwT04m8aIQ=; b=cxqT8LBAH2O7LKd/PReyP2XmtlWAQhp2gzI0TdlY4LwCfm9RGI3GptHjFc01sMUk8DP5hv E4NvXc5Qqj3lKMuhbJ03cnURAz9E056KdL8yIBNKvy/tNoXLuM+1Nk6kttCaQ88aabyEys h93DdwoD1B0erP1mQjVRCoazmEojdh4= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-66-S0uoEppcNEavx1O7W20C_A-1; Fri, 10 Jan 2025 06:05:20 -0500 X-MC-Unique: S0uoEppcNEavx1O7W20C_A-1 X-Mimecast-MFC-AGG-ID: S0uoEppcNEavx1O7W20C_A Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4361f371908so13610765e9.0 for ; Fri, 10 Jan 2025 03:05:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736507119; x=1737111919; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GDrHeHcxdMc+m86AV4aP2MIFDlrI5kqERuwT04m8aIQ=; b=lD6+nw23aaPyYCHvRtSxdSdsd/1tUbcOtHV5poql2qbKf12Mp8Qekr2ELwzasoeMqP kC6ts6LWegCbxCIfoZT/gWPV+eXDWJMJW6J3ac+o3P5TpnKwrEFZYKtIjd04XisihvTm Laoz9jESb3OJi4ymuLCUWvpNBzK1otiU8ipOEEuinhMRG6UssSUIZcvlfNslwWTuszqC xKJmddw7bAwYGB47gDGRH0r/RLzCBmqE5kaERsd4ocd7tX8KNie7POOI6BD/9s5LkhgF 8eRODAfLvauSmZRD197AqWnyp2rmSPRvFRhSWekfk7vgmIPQNVDz47DHghTk1r+wjOYc qFbA== X-Gm-Message-State: AOJu0YymViJFToYS8Otj3A7z2CqXDm6IXpB+3EPce889ZQXB2UChT5c1 wnCWi+wmQb/8FJpjd4iIb7b4bJs0wqmeJS21yzBB9/HmhsE1sak7bfQmeMhXsPl7CmjBNtZGhER 9smVmeQrGUYb51dYz5jg56/UvbeTX3QjncGplv942T1nuK/9617waP0VtuD7Y6wdh8QD7t3vcFQ 832gUesEZyU7pZHh3Mv63wsnpiieP/pYWILSYNr8PC X-Gm-Gg: ASbGnctOdl87TrtnKHe7eKUxRrEX2A8vsSmNFcfWsibLQsRHbSvHtJecmex7mp90Cbk XkV3902WHOEyEV2s0y1ITlnRzNG0YCRu2arslPIBpqj/XYrJigyPyVgcxcFgKdhk5betIOicfyN HDDZ3HFdeztN0/R0hnmjGOI/GZ1X3o+1Zags5tNdaJSXh6gsukZt/TsizQzBiE44GOkojb6tr+J HOMWk8lwtrShd0DFjJCHKHn1YgG2hFxvITiJ6zNhcwrKXhwNcIhyimW6fLaKzSWbKvcX9Kfp5M5 zXvxmc4= X-Received: by 2002:a05:600c:4ed4:b0:436:1b81:b65c with SMTP id 5b1f17b1804b1-436e26c0a33mr102150275e9.15.1736507119289; Fri, 10 Jan 2025 03:05:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IGACLYmcU4v4uyk/ZSaSy4tn+l3xr+spR8WEQtowLinZxBrtKHUrTCnYclvS2di1Y9o2e5vYQ== X-Received: by 2002:a05:600c:4ed4:b0:436:1b81:b65c with SMTP id 5b1f17b1804b1-436e26c0a33mr102149875e9.15.1736507118828; Fri, 10 Jan 2025 03:05:18 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e2ddcb5bsm84774835e9.23.2025.01.10.03.05.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 03:05:17 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Fri, 10 Jan 2025 12:05:08 +0100 Subject: [PATCH 3/4] release.sh: update version files make commit optional Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250110-update-release-v1-3-61e40b8ffbac@kernel.org> References: <20250110-update-release-v1-0-61e40b8ffbac@kernel.org> In-Reply-To: <20250110-update-release-v1-0-61e40b8ffbac@kernel.org> To: linux-xfs@vger.kernel.org Cc: Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3824; i=aalbersh@kernel.org; h=from:subject:message-id; bh=2EUJESO8xyry4tieamUkyHtngI/WVawE7Imfc+Z+388=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0hv+vf54i0+sY1Xv5p2ZU6a99XFre2+yKiJ0T49ef rjFlA1271s6SlkYxLgYZMUUWdZJa01NKpLKP2JQIw8zh5UJZAgDF6cATMRzI8M/QxMJ9y575rxY /s2pG5f/5JsU9epo5OIwIRNW1rsGW957M/z3t/Hdve049+3ooOINwu8Sujks6s+F5jpzX5kautQ qoIQHAC1wR1I= X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Based on ./VERSION script updates all other files. For ./doc/changelog script asks maintainer to fill it manually as not all changes goes into changelog. --no-commit|-n flag is handy when something got into the version commit and need to be changed manually. Then ./release.sh -c will use fixed history Signed-off-by: Andrey Albershteyn --- release.sh | 76 ++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 59 insertions(+), 17 deletions(-) diff --git a/release.sh b/release.sh index a23adc47efa5163b4e0082050c266481e4051bfb..c34efcbcdfcaf50a08853e65542e8f16214cfb4e 100755 --- a/release.sh +++ b/release.sh @@ -11,16 +11,33 @@ set -e -. ./VERSION - -version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} -date=`date +"%-d %B %Y"` - KUP=0 +COMMIT=1 help() { echo "$(basename) - create xfsprogs release" printf "\t[--kup|-k] upload final tarball with KUP\n" + printf "\t[--no-commit|-n] don't create release commit\n" +} + +update_version() { + echo "Updating version files" + # doc/CHANGES + header="xfsprogs-${version} ($(date +'%d %b %Y'))" + sed -i "1s/^/$header\n\t\n\n/" doc/CHANGES + $EDITOR doc/CHANGES + + # ./configure.ac + CONF_AC="AC_INIT([xfsprogs],[${version}],[linux-xfs@vger.kernel.org])" + sed -i "s/^AC_INIT.*/$CONF_AC/" ./configure.ac + + # ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/ -- Nathan Scott `date -R`\n/" ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/ * New upstream release\n/" ./debian/changelog + sed -i "1s/^/\n/" ./debian/changelog + sed -i "1s/^/xfsprogs (${version}-1) unstable; urgency=low\n/" ./debian/changelog } while [ $# -gt 0 ]; do @@ -28,6 +45,9 @@ while [ $# -gt 0 ]; do --kup|-k) KUP=1 ;; + --no-commit|-n) + COMMIT=0 + ;; --help|-h) help exit 0 @@ -40,6 +60,36 @@ while [ $# -gt 0 ]; do shift done +if [ -z "$EDITOR" ]; then + EDITOR=$(command -v vi) +fi + +if [ $COMMIT -eq 1 ]; then + if git diff --exit-code ./VERSION > /dev/null; then + $EDITOR ./VERSION + fi +fi + +. ./VERSION + +version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION} +date=`date +"%-d %B %Y"` + +if [ $COMMIT -eq 1 ]; then + update_version + + git diff --color=always | less -r + [[ "$(read -e -p 'All good? [Y/n]> '; echo $REPLY)" == [Nn]* ]] && exit 0 + + echo "Commiting new version update to git" + git commit --all --signoff --message="xfsprogs: Release v${version} + +Update all the necessary files for a v${version} release." + + echo "Tagging git repository" + git tag --annotate --sign --message="Release v${version}" v${version} +fi + echo "Cleaning up" make realclean rm -rf "xfsprogs-${version}.tar" \ @@ -47,17 +97,6 @@ rm -rf "xfsprogs-${version}.tar" \ "xfsprogs-${version}.tar.asc" \ "xfsprogs-${version}.tar.sign" -echo "Updating CHANGES" -sed -e "s/${version}.*/${version} (${date})/" doc/CHANGES > doc/CHANGES.tmp && \ - mv doc/CHANGES.tmp doc/CHANGES - -echo "Commiting CHANGES update to git" -git commit --all --signoff --message="xfsprogs: Release v${version} - -Update all the necessary files for a v${version} release." - -echo "Tagging git repository" -git tag --annotate --sign --message="Release v${version}" v${version} echo "Making source tarball" make dist @@ -83,4 +122,7 @@ if [ $KUP -eq 1 ]; then pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.gz fi; -echo "Done. Please remember to push out tags using \"git push origin v${version}\"" +echo "" +echo "Done. Please remember to push out tags and the branch." +printf "\tgit push origin v${version}\n" +printf "\tgit push origin master\n" From patchwork Fri Jan 10 11:05:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Albershteyn X-Patchwork-Id: 13934267 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 799FC209F4C for ; Fri, 10 Jan 2025 11:05:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736507125; cv=none; b=CxVYldvknTiWkMpMwylV/rM0iyfCrDzzxfrl91Y3oEKk13U2P7pUK2gAl5iXU+HI88cD7YOciEP3tr0KjbAX0kAhW2+Nm7OMGy52HPhag6Bix9M5OZFg5ouhLOfiLWqS0EqZ45Kv93h80kOHUGhxSxVPMgeoJ3o7ZPqfieflZy8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736507125; c=relaxed/simple; bh=Z/9yNkTOOqXxPx3g30q+XxHGBo3mwl3H4a6V3lKiubg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=U2DjR5IpBiGmd6RL3kUPFy7REAL5BGuEVKunGkYjv2qQcJWHefbvmvC2eJbzByvHZIM6+4gwWIsvl5QE/+4yJbLbtzILb7dC60ZTAQ4qRMXiCeL+jgL9Z4Oiu2yBlKfUaBmbwTTGSba+OldK3TJBlAu6gqYEIDN4WPsbIHV1pbQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=PWkucXQ3; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PWkucXQ3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736507122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hhS4I8YCLNBEYd3uUtYD046Fsw6yKxXpQpanSh5tnzo=; b=PWkucXQ3UC8YJCXJ2Jo7VKDNfQbK6KV1l2WHiuRPajsAU+iUu9QMqOHUr1SSc4CgpxTk9o +Yk/pcs5/+t/ktG5TvmxedpiDjHEK5iuZFbD3BcCComJ54wq1S6Q024gMRiMFCxawDienW VmxWzD/v3GuHTTwqOJNdzn8pyxdHO6w= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-324-k6IlX1gzM_iCkY70VlQbcQ-1; Fri, 10 Jan 2025 06:05:21 -0500 X-MC-Unique: k6IlX1gzM_iCkY70VlQbcQ-1 X-Mimecast-MFC-AGG-ID: k6IlX1gzM_iCkY70VlQbcQ Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-43625ceae52so10499355e9.0 for ; Fri, 10 Jan 2025 03:05:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736507120; x=1737111920; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hhS4I8YCLNBEYd3uUtYD046Fsw6yKxXpQpanSh5tnzo=; b=ebRPDNIaPmRLkeakpZuMPDoAr0a2D9TD+k1tn32EUp6PmcBS0FKebXZzgrZvQsJduY fE69QWCDloqz6LTFQI7hfX8rump9J4BtGroErXujBf5wUZilHKqreIyfSE6mslYXjed6 jExlD6r0i8iPWYQ0LWJMYblOdc5Vlo6Al6J870Yu88+ovO4489j0Cc0sm6QQrV/kd0/F Sdnz9cRC8Ilttj1xihRcMIHGp4E8rVjOom4+ILtk5UL+jdC5NpSUo8ZDF2b5W8OlcnmS WVWqEHQRNZh4NdfjmJ/QAe5SQbFln7nR6vU5CfrKqkaB1TwVSghVucEYRcf8AMWzsgCT kAPg== X-Gm-Message-State: AOJu0YwZzdYG0ATCD3ByU8nYWWMGfM8r5dkYCnRFW2+xEnUKtBR8lPIt fyPZEQQKecdHuE1xpfsIMSoWVdpweKk+XdBSUJPGkZaj7aTbrmk8w9jpVq03PQ8ceDYwXuxPoCI EYDkvLC9Ep+qkNVVSYvImbYlsN0HGb2DeLvP8lN5kUy5zArCiCHHe20u9YHbWFxsJy9WBiIyI3u 7s0l7iVMB1jDqohai+VJAC8nBARUbbTrKHSxlgaZnR X-Gm-Gg: ASbGncvMWE5J/Qu2nO7nHKfKe6qX3AZssJr1YnX+SamZ+cvL+A4kvhyGD9C7wQnH43Z JPsQNwifBUM9ZqmF7q1GEVWFtxuYChMU92yuSj7EEE1ktCyTd2hF74ra7cn+W/XJGxZDHAqnrMA MTUxbkvmmGCSoWmbDteAtZnE+Lo0FdAPG8r9Fv+MomfNbhxx4mbqtJBYCYARndaoBMTM0TxIP8V I1xI1y4dAoPAw8X5/U5dYbZaaBf+GbRcMpjK1moJWR+GfhI7G8vbsoma+0mTnhey2/AmjiWGsOV KSjXPrQ= X-Received: by 2002:a05:600c:25a:b0:431:547e:81d0 with SMTP id 5b1f17b1804b1-436ee0a061emr40215395e9.11.1736507119858; Fri, 10 Jan 2025 03:05:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IGS5dr39aad+GTH0gDcsJO9k7Kug2mFZ2OM9EJITrG8nANyrWbUiG4fpwjrPOk5jGOQ+6qtnQ== X-Received: by 2002:a05:600c:25a:b0:431:547e:81d0 with SMTP id 5b1f17b1804b1-436ee0a061emr40215005e9.11.1736507119445; Fri, 10 Jan 2025 03:05:19 -0800 (PST) Received: from [127.0.0.2] (ip-217-030-074-039.aim-net.cz. [217.30.74.39]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e2ddcb5bsm84774835e9.23.2025.01.10.03.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2025 03:05:19 -0800 (PST) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Fri, 10 Jan 2025 12:05:09 +0100 Subject: [PATCH 4/4] release.sh: generate ANNOUNCE email Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250110-update-release-v1-4-61e40b8ffbac@kernel.org> References: <20250110-update-release-v1-0-61e40b8ffbac@kernel.org> In-Reply-To: <20250110-update-release-v1-0-61e40b8ffbac@kernel.org> To: linux-xfs@vger.kernel.org Cc: Andrey Albershteyn X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2164; i=aalbersh@kernel.org; h=from:subject:message-id; bh=Z/9yNkTOOqXxPx3g30q+XxHGBo3mwl3H4a6V3lKiubg=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIY0hv+vT4pcXT9Zp1VD1QntF99m2aevnLNickcWZwyC qcZdaskWfM7SlkYxLgYZMUUWdZJa01NKpLKP2JQIw8zh5UJZAgDF6cATOQ0AyPD58caW5d+1LkV dtc55Gxu6tUM4Sdcleb3tb8/Fo2u3bWwnuF/dsjbvAtun6oUiu8X8TF9OZJR47J9xzm+yxv2xIh tnqbACgDM1UoO X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 Signed-off-by: Andrey Albershteyn --- release.sh | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/release.sh b/release.sh index c34efcbcdfcaf50a08853e65542e8f16214cfb4e..40ecfaff66c3e9f8d794e7543750bd9579b7c6c9 100755 --- a/release.sh +++ b/release.sh @@ -13,11 +13,13 @@ set -e KUP=0 COMMIT=1 +LAST_HEAD="" help() { echo "$(basename) - create xfsprogs release" printf "\t[--kup|-k] upload final tarball with KUP\n" printf "\t[--no-commit|-n] don't create release commit\n" + printf "\t[--last-head|-h] commit of the last release\n" } update_version() { @@ -48,6 +50,10 @@ while [ $# -gt 0 ]; do --no-commit|-n) COMMIT=0 ;; + --last-head|-h) + LAST_HEAD=$2 + shift + ;; --help|-h) help exit 0 @@ -122,7 +128,45 @@ if [ $KUP -eq 1 ]; then pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.gz fi; +mail_file=$(mktemp) +subject="" +if [ -n "$LAST_HEAD" ]; then + subject="[ANNOUNCE] xfsprogs $(git describe --abbrev=0) released" + + cat << EOF > $mail_file +Hi folks, + +The xfsprogs repository at: + + git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git + +has just been updated. + +Patches often get missed, so if your outstanding patches are properly reviewed +on the list and not included in this update, please let me know. + +The for-next branch has also been updated to match the state of master. + +The new head of the master branch is commit: + +$(git log --oneline --format="%H" -1) + +New commits: + +$(git shortlog --format="[%h] %s" $LAST_HEAD..HEAD) + +Code Diffstat: + +$(git diff --stat --summary -C -M $LAST_HEAD..HEAD) +EOF +fi + echo "" -echo "Done. Please remember to push out tags and the branch." +echo "Done." +echo "Please remember to push out tags and the branch." printf "\tgit push origin v${version}\n" printf "\tgit push origin master\n" +if [ -n "$LAST_HEAD" ]; then + echo "Command to send ANNOUNCE email" + printf "\tneomutt linux-xfs@vger.kernel.org -s \"$subject\" -i $mail_file\n" +fi