2. Project management¶
This week I worked on building out more of my GitLab website. I describe how I did this below. I worked on my introduction web page to introduce myself to other students. I learned about steps for uploading files to my GitLab archive and made sure git was installed on my local PC. I was told to hold off for a bit before pushing to the class archive. I also want to make sure I know what I am doing before pushing, so as to not push large files or strain the system. I copied edited and crated my own student agreement in my archive here: fab academy student agreement
Research and Actions¶
I was getting driven nuts by not being able to control text formatting using markdown so I went to the link https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet listed in Fab Academy Tutorials. The tutorial helped and I was able achieve the formatting I have wanted. I had to look elsewhere to find out that two spaces at the end of a markdown line adds a normal line break. I could not get spell check to work with Firefox and git lab, so that was disappointing. Update: I installed and have been using the Atom editor, it has spell check and a nice markdown preview function that has really sped up my documentation.
I watched the version control recitation video and I learned about how to setup git on my local PC which has Linux mint installed. I have used Linux for a long time for file servers at home and MS Windows daily, until 2019. In 2019 switched to using Linux daily so I could be ready for Fab Academy. Here are the commands I successfully executed in terminal on my home pc:
git config --global user.name "Daniel Meyer"
git config --global user.email "myemail"
I had already setup key previously as required to get going with gitlab so this was returned by my local computer:
Git Lab Setup¶
Today I worked on setting up fpor my first git clone, pull and push.
git clone [email protected]:academany/fabacademy/2020/labs/incitefocus/students/daniel-meyer.git
This was the result:
Cloning into ‘daniel-meyer’… The authenticity of host ‘gitlab.fabcloud.org (22.214.171.124)’ can’t be established. ECDSA key fingerprint is SHA256:Rphnjz211wPLjTJcyAip0xozt0hOoFgT9hl5eZfxzd0. Are you sure you want to continue connecting (yes/no)? n Please type ‘yes’ or ‘no’: no Host key verification failed. fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists.’‘
Something was wrong, so I decide to run the commands below to duble check things:
git version 2.17.1
cat: /home/meistertek/.ssh/id_rsa.pub: No such file or directory
so I ran the command:
ssh-keygen -t rsa -C "my_email"
Generating public/private rsa key pair. Enter file in which to save the key (/home/meistertek/.ssh/id_rsa): Enter passphrase (empty for no passphrase): Enter same passphrase again: Your identification has been saved in /home/meistertek/.ssh/id_rsa. Your public key has been saved in /home/meistertek/.ssh/id_rsa.pub. The key fingerprint is: SHA256:#####myemail The key’s randomart image is:
| ** |
| ** |
| ** |
| ** |
| ** |
| ** |
| ** |
| ** |
| ** |
Ok so now I had a sha256 key setup, time to re-try
Cool my ssh-rsa key was working
Now I followed the ret of the steps at: http://academany.fabcloud.io/fabacademy/2020/recitations/version-control/
git clone https://gitlab.fabcloud.org/my-site address as copied from blue clone dropdown button link on git lab
Cloning into ‘daniel-meyer’…
The authenticity of host ‘gitlab.fabcloud.org (##.##.###.##)’ can’t be established.
ECDSA key fingerprint is SHA256:######.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added ‘gitlab.fabcloud.org,##.##.###.##’ (ECDSA) to the list of known hosts.
remote: Enumerating objects: 42, done.
remote: Counting objects: 100% (42/42), done.
remote: Compressing objects: 100% (42/42), done.
remote: Total 490 (delta 20), reused 0 (delta 0)
Receiving objects: 100% (490/490), 3.00 MiB | 13.89 MiB/s, done.
Resolving deltas: 100% (286/286), done.
It looked like maybe it worked? I thought about where the repository may be located locally… I browsed my home directory and sure enough there was my local repositry in /home/meistertek/daniel-meyer
Now it was time for me to batch process all myu photos with ImageMagick, which was a blast from the past for me. I used to use ImageMagick on a Sun SPARCstation CAD Workstation running UNIX back in the late 90’s. We used a gui with ImageMagick x-windows back then, so I looked to a IamgeMagick gui, it looked like a pain to install. So I decided to look at GIMP batch processing. I found this site for a gimp batch gui plugin that allows re-size and compression to be done easily. [https://ulyssesonline.com/2008/09/22/batch-resize-images-with-gimp/] This worked quite well and was easy to use.
Next I worked on pushing my git repo back up with all the smaller batch processed images.
On branch master Your branch is up to date with ‘origin/master’.
Changes not staged for commit:
(use “git add/rm
deleted: docs/images/fabshop/hdmakerslidewheels.jpg deleted: docs/images/fabshop/leanfablabven.jpg deleted: docs/images/fabshop/rigidmakerslide.jpg deleted: docs/images/sample-pic-2.jpeg deleted: docs/images/scijigs.jpg deleted: docs/images/scimillsketch1.jpg deleted: docs/images/scirota.jpg deleted: docs/images/week01/Fab_Shop_Ad.jpg deleted: docs/images/week01/assignment-photo.jpg deleted: docs/images/week01/dmeyer_bike.jpg deleted: docs/images/week01/dmeyer_mazak_cnc.jpg deleted: docs/images/week01/dmeyer_trs80_modem.jpg deleted: docs/images/week01/dmeyer_welder.jpg deleted: docs/images/week01/msi_fab_lab_team.JPG deleted: docs/images/week01/sshc_airplane_hackers.jpg
(use “git add
docs/images/fabshop/land/ docs/images/fabshop/port/ docs/images/week01/land/ docs/images/week01/port/
no changes added to commit (use “git add” and/or “git commit -a”)
ok the above reflected the changes I had made locally
I had been changing .mk files online through git lab and I had made changes locally to images re-sizing them and making a better images folder structure. Next I ran a git add . command
Nothing returned which in lunux/unix means all went well.
remote: Enumerating objects: 24, done. remote: Counting objects: 100% (24/24), done. remote: Compressing objects: 100% (16/16), done. remote: Total 20 (delta 15), reused 6 (delta 4) Unpacking objects: 100% (20/20), done. From gitlab.fabcloud.org:academany/fabacademy/2020/labs/incitefocus/students/daniel-meyer 6aaee36..46ac5be master -> origin/master Updating 6aaee36..46ac5be Fast-forward docs/assignments/week02.md | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 111 insertions(+), 4 deletions(-)
This looked correct since I had edited online the wee02.md file. Now for git merge
Already up to date.
now git commit -m ‘re-sized images and added folders’
git commit -m 're-sized images and added folders'
[master 82def63] re-sized images and added folders
28 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 docs/images/fabshop/hdmakerslidewheels.jpg
create mode 100644 docs/images/fabshop/land/Fab_Shop_Ad.jpg
create mode 100644 docs/images/fabshop/land/hdmakerslidewheels.jpg
create mode 100644 docs/images/fabshop/land/leanfablabven.jpg
create mode 100644 docs/images/fabshop/land/rigidmakerslide.jpg
create mode 100644 docs/images/fabshop/land/scijigs.jpg
create mode 100644 docs/images/fabshop/land/scirota.jpg
delete mode 100644 docs/images/fabshop/leanfablabven.jpg
create mode 100644 docs/images/fabshop/port/scimillsketch1.jpg
delete mode 100644 docs/images/fabshop/rigidmakerslide.jpg
delete mode 100644 docs/images/sample-pic-2.jpeg
delete mode 100644 docs/images/scijigs.jpg
delete mode 100644 docs/images/scimillsketch1.jpg
delete mode 100644 docs/images/scirota.jpg
delete mode 100644 docs/images/week01/Fab_Shop_Ad.jpg
delete mode 100644 docs/images/week01/assignment-photo.jpg
delete mode 100644 docs/images/week01/dmeyer_bike.jpg
delete mode 100644 docs/images/week01/dmeyer_mazak_cnc.jpg
delete mode 100644 docs/images/week01/dmeyer_trs80_modem.jpg
delete mode 100644 docs/images/week01/dmeyer_welder.jpg
create mode 100644 docs/images/week01/land/dmeyer_bike.jpg
create mode 100644 docs/images/week01/land/dmeyer_mazak_cnc.jpg
create mode 100644 docs/images/week01/land/dmeyer_welder.jpg
create mode 100644 docs/images/week01/land/msi_fab_lab_team.jpg
create mode 100644 docs/images/week01/land/sshc_airplane_hackers.jpg
delete mode 100644 docs/images/week01/msi_fab_lab_team.JPG
create mode 100644 docs/images/week01/port/dmeyer_trs80_modem.jpg
delete mode 100644 docs/images/week01/sshc_airplane_hackers.jpg
ok that was all the stuff that I changed locally being committed to the buffer I guess? now to push
Counting objects: 23, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (22/22), done.
Writing objects: 100% (23/23), 961.15 KiB | 24.03 MiB/s, done.
Total 23 (delta 2), reused 0 (delta 0)
46ac5be..82def63 master -> master
That seemed to work… now to check my git lab fab academy site to see if things worked. It look like it did. However my photo links in my .md files were broken, which was expected. Now off to fix them!
I now have much better understanding of how git works!