From 5813483872ac598f2e421ce19d75171052b42609 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Thu, 20 Aug 2015 19:14:17 +0200 Subject: [PATCH 1/8] Add Multi Source Support for archdi --- CHANGELOG | 10 ++++++++-- archfi | 36 +++++++++++++++++++++++++++++++----- learn/English | 0 lng/French | 2 ++ 4 files changed, 41 insertions(+), 7 deletions(-) mode change 100755 => 100644 learn/English mode change 100755 => 100644 lng/French diff --git a/CHANGELOG b/CHANGELOG index 5c8ce7a..135f95d 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +Builder : +- Updated build process. + +Archdi : +- Add menu to select source server. + + Current Version : ----------------- @@ -12,8 +19,7 @@ Version : 2015.07.19.04.55.32 : ------------------------------- Archdi : -- Update URL to github, - +- Update URL to github. Version : 2015.06.28.20.37.40 : diff --git a/archfi b/archfi index 1ee8ad4..329ec12 100755 --- a/archfi +++ b/archfi @@ -2,8 +2,11 @@ # Arch Linux Fast Install (archfi) # -------------------------------- -# author : https://github.com/MatMoul +# author : MatMoul +# https://github.com/MatMoul +# http://sourceforge.net/u/matmoul # project : https://github.com/MatMoul/archfi +# http://sourceforge.net/projects/archfi/ # license : LGPL-3.0 (http://opensource.org/licenses/lgpl-3.0.html) # # referance : https://wiki.archlinux.org/index.php/Installation_guide @@ -13,7 +16,6 @@ apptitle="Arch Linux Fast Install (archfi) - Version: 2015.07.19.04.55.32 (GPLv3 baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master - # -------------------------------------------------------- mainmenu(){ if [ "$1" = "" ]; then @@ -985,10 +987,30 @@ installarchdi(){ fi fi } +archdidownload(){ + options=() + options+=("sourceforge.net" "recommended") + options+=("github.com" "") + sel=$(whiptail --backtitle "$apptitle" --title "$txtselectserver" --menu "" --cancel-button "Back" 0 0 0 \ + "${options[@]}" \ + 3>&1 1>&2 2>&3) + if [ "$?" = "0" ]; then + case $sel in + "sourceforge.net") + archdiurl=archdi.sourceforge.net/archdi + ;; + "github.com") + archdiurl=matmoul.github.io/archdi >archdi + ;; + esac + fi + curl -L $archdiurl >archdi +} archdiinstallandlaunchchroot(){ cd #curl -L archdi.sourceforge.net/archdi >archdi - curl -L matmoul.github.io/archdi >archdi + #curl -L matmoul.github.io/archdi >archdi >archdi + archdidownload sh archdi -i archdi --chroot exit @@ -996,7 +1018,8 @@ archdiinstallandlaunchchroot(){ archdilaunchchroot(){ cd #curl -L archdi.sourceforge.net/archdi >archdi - curl -L matmoul.github.io/archdi >archdi + #curl -L matmoul.github.io/archdi >archdi >archdi + archdidownload sh archdi --chroot rm archdi exit @@ -1004,7 +1027,8 @@ archdilaunchchroot(){ archdiinstallchroot(){ cd #curl -L archdi.sourceforge.net/archdi >archdi - curl -L matmoul.github.io/archdi >archdi + #curl -L matmoul.github.io/archdi >archdi >archdi + archdidownload sh archdi -i exit } @@ -1018,6 +1042,8 @@ pressanykey(){ } loadstrings(){ + txtselectserver="Select source server :" + txtmainmenu="Main Menu" txtlanguage="Language" txtsetkeymap="Set Keyboard Layout" diff --git a/learn/English b/learn/English old mode 100755 new mode 100644 diff --git a/lng/French b/lng/French old mode 100755 new mode 100644 index 2350010..3bb87e6 --- a/lng/French +++ b/lng/French @@ -6,6 +6,8 @@ # notes : misc text... +txtselectserver="Sélectionnez le serveur source :" + txtmainmenu="Menu Principal" txtlanguage="Language" txtsetkeymap="Disposition clavier" From 2f9ff7ecd3321dfeea15751546349290260daaa0 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Thu, 20 Aug 2015 19:14:56 +0200 Subject: [PATCH 2/8] Create new make process --- makerelease | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 makerelease diff --git a/makerelease b/makerelease new file mode 100755 index 0000000..a2b8ad0 --- /dev/null +++ b/makerelease @@ -0,0 +1,44 @@ +#!/bin/bash + +prjname=archfi +version=$(date +"%Y.%m.%d.%H.%M.%S") +srcpath=. + +#archfi +#sed /apptitle=/c\apptitle=\""Arch Linux Fast Install (archfi) - Version: $version (GPLv3)"\" archfi |more +#sed /baseurl=/c\baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master archfi |more +#sed -i /apptitle=/c\apptitle=\""Arch Linux Fast Install (archfi) - Version: $version (GPLv3)"\" archfi +#sed -i /baseurl=/c\baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master archfi + + +#CHANGELOG +#sed '/Current\ Version\ :/{n;d}' CHANGELOG |more +#sed '/Current\ Version\ :/a-------------------------------' CHANGELOG |more +#sed "/Current\ Version\ :/c\Version\ :\ $version\ :" CHANGELOG |more +sed '1s/^/\n/' CHANGELOG |more +sed '1s/^/-----------------\n/' CHANGELOG |more +sed '1s/^/Current Version :\n/' CHANGELOG |more + +#commit +#fuse branch + + + + +#Sourceforge : + +#archfi +#baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master + +# Make redirect Page +#pubfile=resources/sourceforge.net/pub/$prjname/index.php +#echo " $pubfile +#echo "header(\"Location: http://downloads.sourceforge.net/project/$prjname/release/$version/$prjname\");" >> $pubfile +#echo "exit;" >> $pubfile +#echo "?>" >> $pubfile +# End Make redirect Page + +# Publish files +#scp -r $targetpath matmoul@web.sourceforge.net:/home/frs/project/$prjname/release/ +#scp -r $pubfile matmoul@web.sourceforge.net:/home/project-web/$prjname/htdocs/$prjname/ +# End Publish files From 8bf52a6125970cd40db7a5abd2a0d4eb914bce89 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Thu, 20 Aug 2015 19:15:51 +0200 Subject: [PATCH 3/8] Chmod 640 CHANGELOG --- CHANGELOG | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG old mode 100755 new mode 100644 From 86fcf7896e68b4b95be4c9d6c7be49469483c414 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Thu, 20 Aug 2015 19:44:59 +0200 Subject: [PATCH 4/8] New makerelease --- makerelease | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/makerelease b/makerelease index a2b8ad0..3d4700d 100755 --- a/makerelease +++ b/makerelease @@ -2,25 +2,42 @@ prjname=archfi version=$(date +"%Y.%m.%d.%H.%M.%S") -srcpath=. +branch=$(git rev-parse --abbrev-ref HEAD) -#archfi -#sed /apptitle=/c\apptitle=\""Arch Linux Fast Install (archfi) - Version: $version (GPLv3)"\" archfi |more -#sed /baseurl=/c\baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master archfi |more +clear +read -p "Current branch is $branch. Continue ? (y/N)" choice +case "$choice" in + n|N|'' ) + echo "cancel build !" + exit 1 + ;; + y|Y ) echo "Begin Build Release...";; + * ) + echo "cancel build !" + exit 1 + ;; +esac +echo "Building version $version..." +echo "" + +echo "Finalise archfi script..." #sed -i /apptitle=/c\apptitle=\""Arch Linux Fast Install (archfi) - Version: $version (GPLv3)"\" archfi #sed -i /baseurl=/c\baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master archfi +echo "Finalise CHANGELOG..." +#sed -i '/Current\ Version\ :/{n;d}' CHANGELOG +#sed -i '/Current\ Version\ :/a-------------------------------' CHANGELOG +#sed -i "/Current\ Version\ :/c\Version\ :\ $version\ :" CHANGELOG +#sed -i '1s/^/\n/' CHANGELOG +#sed -i '1s/^/-----------------\n/' CHANGELOG +#sed -i '1s/^/Current Version :\n/' CHANGELOG -#CHANGELOG -#sed '/Current\ Version\ :/{n;d}' CHANGELOG |more -#sed '/Current\ Version\ :/a-------------------------------' CHANGELOG |more -#sed "/Current\ Version\ :/c\Version\ :\ $version\ :" CHANGELOG |more -sed '1s/^/\n/' CHANGELOG |more -sed '1s/^/-----------------\n/' CHANGELOG |more -sed '1s/^/Current Version :\n/' CHANGELOG |more +echo "Make last commit..." +git commit -m "New Release : $version" * -#commit -#fuse branch +echo "Merge branch $branch to master..." +git checkout master +git merge $branch From 58625bea5afa35f10ebe34d683fab767cfd6bb3e Mon Sep 17 00:00:00 2001 From: MatMoul Date: Thu, 20 Aug 2015 19:51:52 +0200 Subject: [PATCH 5/8] Add comment --- makerelease | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makerelease b/makerelease index 3d4700d..f823344 100755 --- a/makerelease +++ b/makerelease @@ -38,7 +38,7 @@ git commit -m "New Release : $version" * echo "Merge branch $branch to master..." git checkout master git merge $branch - +#git push From c0ac480edefe54d34ed70060a21b666b9f560cc7 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Thu, 20 Aug 2015 19:52:07 +0200 Subject: [PATCH 6/8] New Release : 2015.08.20.19.52.03 --- archfi | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 archfi diff --git a/archfi b/archfi old mode 100755 new mode 100644 From 771847530b68229694cf5ee2d9864f0c40418021 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Thu, 20 Aug 2015 19:55:24 +0200 Subject: [PATCH 7/8] Update make release --- makerelease | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) mode change 100755 => 100644 makerelease diff --git a/makerelease b/makerelease old mode 100755 new mode 100644 index f823344..576d1cf --- a/makerelease +++ b/makerelease @@ -21,16 +21,16 @@ echo "Building version $version..." echo "" echo "Finalise archfi script..." -#sed -i /apptitle=/c\apptitle=\""Arch Linux Fast Install (archfi) - Version: $version (GPLv3)"\" archfi -#sed -i /baseurl=/c\baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master archfi +sed -i /apptitle=/c\apptitle=\""Arch Linux Fast Install (archfi) - Version: $version (GPLv3)"\" archfi +sed -i /baseurl=/c\baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master archfi echo "Finalise CHANGELOG..." -#sed -i '/Current\ Version\ :/{n;d}' CHANGELOG -#sed -i '/Current\ Version\ :/a-------------------------------' CHANGELOG -#sed -i "/Current\ Version\ :/c\Version\ :\ $version\ :" CHANGELOG -#sed -i '1s/^/\n/' CHANGELOG -#sed -i '1s/^/-----------------\n/' CHANGELOG -#sed -i '1s/^/Current Version :\n/' CHANGELOG +sed -i '/Current\ Version\ :/{n;d}' CHANGELOG +sed -i '/Current\ Version\ :/a-------------------------------' CHANGELOG +sed -i "/Current\ Version\ :/c\Version\ :\ $version\ :" CHANGELOG +sed -i '1s/^/\n/' CHANGELOG +sed -i '1s/^/-----------------\n/' CHANGELOG +sed -i '1s/^/Current Version :\n/' CHANGELOG echo "Make last commit..." git commit -m "New Release : $version" * From cd1ccd14c9409d8ceb2272fccee6eee60e5f296c Mon Sep 17 00:00:00 2001 From: MatMoul Date: Thu, 20 Aug 2015 19:55:43 +0200 Subject: [PATCH 8/8] New Release : 2015.08.20.19.55.41 --- CHANGELOG | 7 +++++-- archfi | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 135f95d..06192a0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Current Version : +----------------- + Builder : - Updated build process. @@ -5,8 +8,8 @@ Archdi : - Add menu to select source server. -Current Version : ------------------ +Version : 2015.08.20.19.55.41 : +------------------------------- Licence : - GPL-3.0 -> LGPL-3.0. diff --git a/archfi b/archfi index 329ec12..87ac9a7 100644 --- a/archfi +++ b/archfi @@ -12,7 +12,7 @@ # referance : https://wiki.archlinux.org/index.php/Installation_guide -apptitle="Arch Linux Fast Install (archfi) - Version: 2015.07.19.04.55.32 (GPLv3)" +apptitle="Arch Linux Fast Install (archfi) - Version: 2015.08.20.19.55.41 (GPLv3)" baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master