move scripts to scripts dir

add VS code workspace for linux dir
that also includes onboard-keyman dir
fix cow.sh creation of hook scripts
This commit is contained in:
glasseyes 2018-09-06 10:43:40 +07:00
parent f49ad06599
commit c294c8d9df
7 changed files with 29 additions and 17 deletions

View file

@ -1,37 +1,37 @@
#!/usr/bin/make
tmpbuild: devreconf
./build.sh
./scripts/build.sh
install_local: devreconf
SUDOINSTALL="yes" ./build.sh
SUDOINSTALL="yes" ./scripts/build.sh
uninstall_local: devreconf
SUDOINSTALL="uninstall" ./build.sh
SUDOINSTALL="uninstall" ./scripts/build.sh
debnocow:
./deb.sh
./scripts/deb.sh
reconf:
./reconf.sh
./scripts/reconf.sh
dist:
./dist.sh
./scripts/dist.sh
origdist:
./dist.sh origdist
./scripts/dist.sh origdist
sourcepackage: reconf origdist
./deb.sh sourcepackage
./scripts/deb.sh sourcepackage
devsourcepackage: devreconf origdist
./deb.sh sourcepackage
./scripts/deb.sh sourcepackage
devreconf:
./reconf.sh dev
./scripts/reconf.sh dev
cow:
./cow.sh
./scripts/cow.sh
deb: devreconf origdist cow debnocow
echo "Built dev Debian packages in builddebs/"

View file

@ -0,0 +1,10 @@
{
"folders": [
{
"path": "."
},
{
"path": "../onboard-keyman"
},
],
}

View file

@ -7,7 +7,6 @@ set -e
distributions='bionic xenial'
dpkgcheck=`dpkg-query -l cowbuilder`
if [ $? != 0 ]; then
@ -26,12 +25,15 @@ for dist in $distributions; do
fi
sudo mkdir -p /var/cache/pbuilder/hook.d/${dist}
if [ ! -e /var/cache/pbuilder/hook.d/${dist}/D70results ]; then
sudo echo "#!/bin/bash" > /var/cache/pbuilder/hook.d/${dist}/D70results
sudo echo "cd /var/cache/pbuilder/result/bionic" >> /var/cache/pbuilder/hook.d/${dist}/D70results
sudo echo "/usr/bin/dpkg-scanpackages . /dev/null > /var/cache/pbuilder/result/bionic/Packages" >> /var/cache/pbuilder/hook.d/${dist}/D70results
sudo echo "/usr/bin/apt-get update" >> /var/cache/pbuilder/hook.d/${dist}/D70results
echo "#!/bin/bash" | sudo tee /var/cache/pbuilder/hook.d/${dist}/D70results
echo "cd /var/cache/pbuilder/result/${dist}" | sudo tee -a /var/cache/pbuilder/hook.d/${dist}/D70results
echo "/usr/bin/dpkg-scanpackages . /dev/null > /var/cache/pbuilder/result/${dist}/Packages" | sudo tee -a /var/cache/pbuilder/hook.d/${dist}/D70results
echo "/usr/bin/apt-get update" | sudo tee -a /var/cache/pbuilder/hook.d/${dist}/D70results
sudo ln -s /var/cache/pbuilder/hook.d/${dist}/D70results /var/cache/pbuilder/hook.d/${dist}/B70buildresults
fi
if [ ! -e /var/cache/pbuilder/hook.d/${dist}/D80no-man-db-rebuild ]; then
sudo ln -s /usr/share/doc/pbuilder/examples/D80no-man-db-rebuild /var/cache/pbuilder/hook.d/${dist}/D80no-man-db-rebuild
fi
sudo mkdir -p /var/cache/pbuilder/result/${dist}
sudo cowbuilder update --distribution ${dist} --basepath /var/cache/pbuilder/base-${dist}.cow --override-config --othermirror="deb [trusted=yes] file:/var/cache/pbuilder/result/${dist} ./" --bindmounts /var/cache/pbuilder/result/${dist} --hookdir /var/cache/pbuilder/hook.d/${dist}
done
done