rebrand and clean
This commit is contained in:
parent
7e83b448fa
commit
7a4f22f75e
5 changed files with 21 additions and 147 deletions
|
@ -1,10 +0,0 @@
|
|||
# archdi-pkg CONTRIBUTING
|
||||
|
||||
## Contributing :
|
||||
* Open an issue before work to hard
|
||||
* **Work on the develop branch**
|
||||
* **Use tab for identation**
|
||||
* **Preserve identation on empty line**
|
||||
* **Test your changes (archdi -t github-username archdi-pkg-branchname)**
|
||||
|
||||
- [ ] I've read these rules before submitting my PR.
|
15
README.md
15
README.md
|
@ -1,12 +1,7 @@
|
|||
# archdi-pkg
|
||||
# obosdi-pkg
|
||||
### Fork of [MatMoul's archdi-pkg](https://github.com/MatMoul/archdi-pkg)
|
||||
|
||||
This project is part of archdi.<br>
|
||||
look at archdi project to use it : https://github.com/MatMoul/archdi
|
||||
This project is part of obosdi.<br>
|
||||
look at obosdi project to use it : https://git.ouroboros.group/Ouroboros/obosdi
|
||||
|
||||
If you want request a new features for archdi use issues on this project (https://github.com/MatMoul/archdi-pkg/issues).
|
||||
|
||||
Other way is to fork this project, add features and request a pullback.<br>
|
||||
For testing, you can use:<br>
|
||||
archdi -t {githubusername} {archdi-pkg branch name}<br>
|
||||
as exemple :<br>
|
||||
archdi -t matmoul src
|
||||
If you want request a new features for obosdi use issues on this project (https://git.ouroboros.group/Ouroboros/obosdi-pkg/issues).
|
||||
|
|
12
README.txt
12
README.txt
|
@ -1,12 +0,0 @@
|
|||
# archdi-pkg
|
||||
|
||||
This project is part of archdi.<br>
|
||||
look at archdi project to use it : https://github.com/MatMoul/archdi
|
||||
|
||||
If you want request new features for archdi use issues on this project (https://github.com/MatMoul/archdi-pkg/issues).
|
||||
|
||||
Other way is to fork this project, add features and request a pullback.
|
||||
For testing, you can use:
|
||||
archdi -t {githubusername} {archdi-pkg branch name}
|
||||
as exemple :
|
||||
archdi -t matmoul src
|
27
lib
27
lib
|
@ -1,23 +1,28 @@
|
|||
#!/bin/bash
|
||||
|
||||
|
||||
# Arch Linux Desktop Install (archdi)
|
||||
# -----------------------------------
|
||||
# author : MatMoul
|
||||
# Ourobor.OS Fast Install (obos-fi)
|
||||
# --------------------------------
|
||||
# archdi author : MatMoul
|
||||
# https://github.com/MatMoul
|
||||
# http://sourceforge.net/u/matmoul
|
||||
# project : https://github.com/MatMoul/archdi
|
||||
# http://sourceforge.net/projects/archdi/
|
||||
# license : GPLv3 (http://opensource.org/licenses/GPL-3.0)
|
||||
# obosdi author : LimePotato (Ouroboros)
|
||||
# https://limepot.xyz/
|
||||
# https://git.ouroboros.group/Ouroboros/
|
||||
# https://git.ouroboros.group/LimePotato/
|
||||
#
|
||||
# project : https://git.ouroboros.group/Ouroboros/obos-fi
|
||||
#
|
||||
# license : LGPL-3.0 (http://opensource.org/licenses/lgpl-3.0.html)
|
||||
|
||||
|
||||
|
||||
apptitle="Arch Linux Desktop Install (archdi) - Version: 2022.11.20.22.42.58 (GPLv3)"
|
||||
baseurl=https://raw.githubusercontent.com/MatMoul/archdi-pkg/master
|
||||
cachedir=~/.cache/archdi
|
||||
apptitle="Ourobor.OS Desktop Install (obosdi) - Version: 0.0.1 (GPLv3)"
|
||||
baseurl=https://git.ouroboros.group/Ouroboros/obosdi-pkg/raw/branch/master
|
||||
cachedir=~/.cache/obosdi
|
||||
|
||||
|
||||
cat << EOF > dialog.archfi
|
||||
cat << EOF > dialog.obosfi
|
||||
use_shadow = OFF
|
||||
title_color = (BLACK,WHITE,OFF)
|
||||
button_label_active_color = (WHITE,BLUE,ON)
|
||||
|
@ -29,7 +34,7 @@ tag_key_selected_color = (WHITE,BLUE,ON)
|
|||
check_color = tag_color
|
||||
check_selected_color = tag_selected_color
|
||||
EOF
|
||||
export DIALOGRC="dialog.archfi"
|
||||
export DIALOGRC="dialog.obosfi"
|
||||
|
||||
|
||||
# $1: path
|
||||
|
|
104
makerelease
104
makerelease
|
@ -1,104 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
prjname=archdi
|
||||
version=$(date +"%Y.%m.%d.%H.%M.%S")
|
||||
branch=$(git rev-parse --abbrev-ref HEAD)
|
||||
|
||||
ssh -T git@github.com
|
||||
if [ ! "$?" = "1" ]; then
|
||||
echo "No Github ssh key loaded exiting..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#scp "matmoul@web.sourceforge.net:/home/frs/project/$prjname/README.txt" /dev/null
|
||||
scp "matmoul@web.sourceforge.net:/home/frs/project/archdi/release/bin/2018.06.05.01.34.45/README.txt" /dev/null
|
||||
if [ ! "$?" = "0" ]; then
|
||||
echo "No Sourceforge ssh key loaded exiting..."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
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 lib script..."
|
||||
sed -i /apptitle=/c\apptitle=\""Arch Linux Desktop Install (archdi) - Version: $version (GPLv3)"\" lib
|
||||
sed -i /baseurl=/c\baseurl=https://raw.githubusercontent.com/MatMoul/archdi-pkg/master lib
|
||||
|
||||
rm pkg.tar
|
||||
tar -cf pkg.tar *
|
||||
|
||||
echo "Make last commit..."
|
||||
git commit -a -m "New Release : $version"
|
||||
|
||||
if [ ! "$branch" = "master" ]; then
|
||||
echo "Merge branch $branch to master..."
|
||||
git checkout master
|
||||
git pull
|
||||
git merge $branch
|
||||
|
||||
read -p "Delete branch $branch ? (y/N)" choice
|
||||
case "$choice" in
|
||||
y|Y )
|
||||
git branch -D $branch
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
read -p "Publish to server ? (Y/n)" choice
|
||||
case "$choice" in
|
||||
n|N )
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
echo "Push release..."
|
||||
git push
|
||||
|
||||
|
||||
#Sourceforge :
|
||||
|
||||
targetpath=.build/$version
|
||||
mkdir -p $targetpath
|
||||
cp -R * $targetpath
|
||||
|
||||
echo "Finalise lib script..."
|
||||
sed -i "/baseurl=/c\baseurl=http://downloads.sourceforge.net/project/archdi/release/pkg/$version" $targetpath/lib
|
||||
|
||||
cd $targetpath
|
||||
rm pkg.tar
|
||||
tar -cf pkg.tar *
|
||||
find . ! -name 'pkg.tar' -exec rm -rf "$1" {} \;
|
||||
cd ../..
|
||||
|
||||
echo "Publish release..."
|
||||
rsync -r $targetpath matmoul@web.sourceforge.net:/home/frs/project/$prjname/release/pkg/
|
||||
|
||||
echo "Update pkg redirect page..."
|
||||
pubfile=.build/index.php
|
||||
echo "<?php" > $pubfile
|
||||
echo "header(\"Location: http://downloads.sourceforge.net/project/$prjname/release/pkg/$version/pkg.tar\");" >> $pubfile
|
||||
echo "exit;" >> $pubfile
|
||||
echo "?>" >> $pubfile
|
||||
scp $pubfile matmoul@web.sourceforge.net:/home/project-web/$prjname/htdocs/$prjname-pkg/index.php
|
||||
|
||||
rm -R .build
|
||||
|
||||
if [ ! "$branch" = "master" ]; then
|
||||
git checkout $branch
|
||||
git merge master
|
||||
git push
|
||||
fi
|
Loading…
Reference in a new issue