updated

- setupPosatgres.bat to populate database
- notas.txt with todo
- setup/data with setup files

README.md

@@ -1,31 +1,29 @@
+#### A Free and Opensource Library Manager writen in Java
+
+#### Um Gerenciador de Bibliotecas grátis e opensource escrito em Java
+
+------
+
 ### Clone this repository 
 
-HTTPS: https://git.librography.org/flashlan/Librography.git
+***HTTPS:*** 
 
-SSH: git@git.librography.org:flashlan/Librography.git
+`git clone https://git.librography.org/ci/Librography.git`
+
+or 
+
+`git clone https://github.com/flashlan/Librography.git`
+
+***SSH:***
 
 
+`git clone git@git.librography.org:ci/Librography.git`
 
-### Creating a new repository on the command line
+or 
 
-```
-touch README.md
-git init
+`git clone  git@github.com:flashlan/Librography.git`
 
-git add README.md
-git commit -m "first commit"
-git remote add origin https://git.librography.com/flashlan/Librography.git
-git push -u origin master
-```
-
-### Pushing an existing repository from the command line
-
-```
-git remote add origin https://git.librography.com/flashlan/Librography.git
-git push -u origin master
-```
-
-## GoldenOwl
+## Librography
 
 ---------
 

Setup-Windows/setupPostgres.bat

@@ -50,9 +50,11 @@ SET PATH=%PATH%;C:\Librography_data\postgres\bin
 psql -U postgres -c "CREATE DATABASE %dbname%;"
 psql -U postgres -c "CREATE USER '%dbuser%'@'localhost' IDENTIFIED BY '%userpassword%';"
 psql -U postgres -c "GRANT ALL PRIVILEGES ON %dbuser%.* TO '%dbuser%'@'localhost';"
-
 psql -U postgres -c "FLUSH PRIVILEGES;"
-psql -U postgres -c "source script-posgresql.sql"
+psql -U postgres -f script-postgresql.sql -d applibrography
+Rem psql -U postgres -c "\c applibrography; \i script-postgresql.sql;"
+Rem psql -U postgres -c "source script-posgresql.sql"
+Rem psql -U postgres -c "\i script-postgresql.sql;"
 echo Done.
 echo "Postgresql user created."
 echo "Username:   %dbuser%"

comandos git.txt

@@ -0,0 +1,56 @@
+GIT Librography
+
+git add .
+git commit -m "mensagem"
+# Enviar mudanças (ambos)
+git push origin master
+
+# atualizar arquivos do repositorio remoto para o local
+git pull origin master
+
+#Rotulando (o 1b2e1d63ff representa os 10 primeiros caracteres do id de commit)
+git log
+git tag 1.0.0 1b2e1d63ff
+
+# Branchs
+git checkout -b funcionalidade_x
+# retorne para o master usando
+git checkout master
+# e remova o branch da seguinte forma
+git branch -d funcionalidade_x
+# envie o branch para seu repositório remoto
+git push origin <funcionalidade_x>
+
+# merge (para fazer merge de um outro branch ao seu branch ativo)
+git diff <branch origem> <branch destino>
+git merge <branch>
+
+# sobrescrever alterações locais
+git checkout -- <arquivo>
+# ou recupere o histórico mais recente do servidor
+git fetch origin
+git reset --hard origin/master
+
+@Github
+# git init
+git add .
+git commit -m "mensagem"
+git remote -v
+git config --global core.compression 0
+git config --global pack.window 1
+git push -u github master
+
+@Gitea
+git push origin master --force
+
+
+- erro de disconnect github push
+# git config --global core.compression 0
+
+### Manage urls git remote ####
+git remote -v
+git remote add github git@github.com:flashlan/Librography.git
+
+# setar multiplos remotes para atualizar com um comando (push)
+git remote set-url --add --push origin git@github.com:flashlan/Librography.git
+

notas.txt

@@ -2,6 +2,16 @@
  carateres estranhios mysql
  build for ant
  
+ finalizado script postgresSetup.bat
+ --> proceder alteraçao opcional do banco
+		usar Pgadmin 
+ --> Criar Windows Installer
+		Inno setup - script criado
+		./setup/data is in .zip format
+		Inno get files from C:\Librography to create installer
+		
  
- convert sysntax: mysql to postgresql -> sqlite
+ 
+ 
+ convert syntax: mysql to postgresql -> sqlite